From 60661932d84b4c2debad46422df585e2cdcceffd Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 31 Dec 2024 00:47:02 +0900 Subject: [PATCH 01/81] python312Packages.booleanoperations: refactor --- .../booleanoperations/default.nix | 37 +++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/booleanoperations/default.nix b/pkgs/development/python-modules/booleanoperations/default.nix index ca2518dbb4ea..9ade956db688 100644 --- a/pkgs/development/python-modules/booleanoperations/default.nix +++ b/pkgs/development/python-modules/booleanoperations/default.nix @@ -3,41 +3,48 @@ buildPythonPackage, fetchPypi, fonttools, - fs, pyclipper, defcon, fontpens, + setuptools, setuptools-scm, - pytest, + pytestCheckHook, }: buildPythonPackage rec { pname = "booleanoperations"; version = "0.9.0"; + pyproject = true; src = fetchPypi { pname = "booleanOperations"; inherit version; - sha256 = "1f41lb19m8azchl1aqz6j5ycbspb8jsf1cnn42hlydxd68f85ylc"; + hash = "sha256-jPqCHDKtN0+hINay4LRE6+rFfJHmYxUoZF+hmsKigbg="; extension = "zip"; }; - nativeBuildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ - fonttools - fs - pyclipper - defcon - fontpens + build-system = [ + setuptools + setuptools-scm ]; - nativeCheckInputs = [ pytest ]; + dependencies = [ + fonttools + pyclipper + ]; - meta = with lib; { + pythonImportsCheck = [ "booleanOperations" ]; + + nativeCheckInputs = [ + defcon + fontpens + pytestCheckHook + ]; + + meta = { description = "Boolean operations on paths"; homepage = "https://github.com/typemytype/booleanOperations"; - license = licenses.mit; - maintainers = [ maintainers.sternenseemann ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.sternenseemann ]; }; } From 41728e065f81581ccbf5007006a20809f3c9e307 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 1 Jan 2025 11:41:05 +0900 Subject: [PATCH 02/81] python312Packages.matrix-client: refactor --- .../python-modules/matrix-client/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index 034a1745b990..fa2445662c06 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -5,21 +5,26 @@ pytestCheckHook, requests, responses, + setuptools, urllib3, }: buildPythonPackage rec { pname = "matrix-client"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "matrix_client"; inherit version; - sha256 = "0mii7ib3bah5ppqs7i8sjv5l0zbl57011908m4l0jbyby90ayy06"; + hash = "sha256-BnivQPLLLwkoqQikEMApdH1Ay5YaxaPxvQWqNVY8MVY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + pythonRelaxDeps = [ "urllib3" ]; + + dependencies = [ requests urllib3 ]; @@ -36,10 +41,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "matrix_client" ]; - meta = with lib; { + meta = { description = "Python Matrix Client-Server SDK"; homepage = "https://github.com/matrix-org/matrix-python-sdk"; - license = licenses.asl20; - maintainers = with maintainers; [ olejorgenb ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ olejorgenb ]; }; } From 13384429ea872f579cb514f7cde54b050b4003b2 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 1 Jan 2025 11:45:38 +0900 Subject: [PATCH 03/81] python312Packages.matrix-api-async: remove matrix-api-async has been removed as it is an old wrapper and no longer in use --- .../matrix-api-async/default.nix | 30 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 pkgs/development/python-modules/matrix-api-async/default.nix diff --git a/pkgs/development/python-modules/matrix-api-async/default.nix b/pkgs/development/python-modules/matrix-api-async/default.nix deleted file mode 100644 index 5bc3704441a3..000000000000 --- a/pkgs/development/python-modules/matrix-api-async/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - matrix-client, -}: - -buildPythonPackage rec { - pname = "matrix_api_async"; - version = "0.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0xdx8fci0lar3x09dwqgka6ssz9d3g7gsfx4yyr13sdwza7zsqc3"; - }; - - propagatedBuildInputs = [ matrix-client ]; - - # no tests - doCheck = false; - - pythonImportsCheck = [ "matrix_api_async" ]; - - meta = with lib; { - description = "Asyncio wrapper of matrix_client.api"; - license = licenses.mit; - homepage = "https://github.com/Cadair/matrix_api_async"; - maintainers = with maintainers; [ globin ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 83264b2be12a..8afb3bb32d6c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -353,6 +353,7 @@ mapAliases ({ mapbox = throw "mapbox has been removed because the upstream repository was archived in 2022"; # Added 2024-10-04 marshmallow-enum = throw "marshmallow-enum has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10 markerlib = throw "markerlib has been removed because it's abandoned since 2013"; # added 2023-05-19 + matrix-api-async = throw "matrix-api-async has been removed as it is an old wrapper and no longer in use"; # added 2025-01-01 memory_profiler = memory-profiler; # added 2023-10-09 mir_eval = mir-eval; # added 2024-01-07 mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index acc79f773b74..30376aaf326d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7945,8 +7945,6 @@ self: super: with self; { matplotx = callPackage ../development/python-modules/matplotx { }; - matrix-api-async = callPackage ../development/python-modules/matrix-api-async { }; - matrix-client = callPackage ../development/python-modules/matrix-client { }; matrix-common = callPackage ../development/python-modules/matrix-common { }; From 7b04cae6c62506ad680279042dbde534f4394ae2 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 1 Jan 2025 12:01:30 +0900 Subject: [PATCH 04/81] python312Packages.scikits-odes-core: init at 3.1.0 --- .../scikits-odes-core/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/scikits-odes-core/default.nix diff --git a/pkgs/development/python-modules/scikits-odes-core/default.nix b/pkgs/development/python-modules/scikits-odes-core/default.nix new file mode 100644 index 000000000000..2ad7ba3ff35e --- /dev/null +++ b/pkgs/development/python-modules/scikits-odes-core/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "scikits-odes-core"; + version = "3.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bmcage"; + repo = "odes"; + tag = "v${version}"; + hash = "sha256-wOdqRzj45piT9P+qA0xXBCnOZ9Xh+Waej2t51mDcilc="; + }; + + sourceRoot = "${src.name}/packages/scikits-odes-core"; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "scikits_odes_core" ]; + + # no tests + doCheck = false; + + meta = { + description = "Core support module for scikits-odes"; + homepage = "https://github.com/bmcage/odes/blob/master/packages/scikits-odes-core"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ idontgetoutmuch ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index acc79f773b74..a227ec80a193 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14456,6 +14456,8 @@ self: super: with self; { scikits-odes = callPackage ../development/python-modules/scikits-odes { }; + scikits-odes-core = callPackage ../development/python-modules/scikits-odes-core { }; + scikit-tda = callPackage ../development/python-modules/scikit-tda { }; scipy = callPackage ../development/python-modules/scipy { }; From ade6b8dae63804e823bebdbc961cb657392f145a Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 1 Jan 2025 12:10:32 +0900 Subject: [PATCH 05/81] python312Packages.scikits-odes-daepack: init at 3.1.0 --- .../scikits-odes-daepack/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/scikits-odes-daepack/default.nix diff --git a/pkgs/development/python-modules/scikits-odes-daepack/default.nix b/pkgs/development/python-modules/scikits-odes-daepack/default.nix new file mode 100644 index 000000000000..228f1c007e7e --- /dev/null +++ b/pkgs/development/python-modules/scikits-odes-daepack/default.nix @@ -0,0 +1,37 @@ +{ + buildPythonPackage, + gfortran, + meson-python, + numpy, + scikits-odes-core, +}: + +buildPythonPackage rec { + inherit (scikits-odes-core) version src; + pname = "scikits-odes-daepack"; + pyproject = true; + + sourceRoot = "${src.name}/packages/scikits-odes-daepack"; + + build-system = [ + meson-python + numpy + ]; + + nativeBuildInputs = [ gfortran ]; + + dependencies = [ + numpy + scikits-odes-core + ]; + + pythonImportsCheck = [ "scikits_odes_daepack" ]; + + # no tests + doCheck = false; + + meta = scikits-odes-core.meta // { + description = "Wrapper around daepack"; + homepage = "https://github.com/bmcage/odes/blob/master/packages/scikits-odes-daepack"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a227ec80a193..7e0697449bad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14458,6 +14458,8 @@ self: super: with self; { scikits-odes-core = callPackage ../development/python-modules/scikits-odes-core { }; + scikits-odes-daepack = callPackage ../development/python-modules/scikits-odes-daepack { }; + scikit-tda = callPackage ../development/python-modules/scikit-tda { }; scipy = callPackage ../development/python-modules/scipy { }; From 2f6cfef5fbe298ac699025421db0d61253d2b821 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 1 Jan 2025 12:24:02 +0900 Subject: [PATCH 06/81] python312Packages.scikits-odes-sundials: init at 3.1.0 --- .../scikits-odes-sundials/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/scikits-odes-sundials/default.nix diff --git a/pkgs/development/python-modules/scikits-odes-sundials/default.nix b/pkgs/development/python-modules/scikits-odes-sundials/default.nix new file mode 100644 index 000000000000..42deba278c19 --- /dev/null +++ b/pkgs/development/python-modules/scikits-odes-sundials/default.nix @@ -0,0 +1,41 @@ +{ + buildPythonPackage, + sundials, + cython, + numpy, + pkgconfig, + setuptools, + scikits-odes-core, + pytestCheckHook, +}: + +buildPythonPackage rec { + inherit (scikits-odes-core) version src; + pname = "scikits-odes-sundials"; + pyproject = true; + + sourceRoot = "${src.name}/packages/scikits-odes-sundials"; + + build-system = [ + cython + numpy + pkgconfig + setuptools + ]; + + buildInputs = [ sundials ]; + + dependencies = [ + numpy + scikits-odes-core + ]; + + pythonImportsCheck = [ "scikits_odes_sundials" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = scikits-odes-core.meta // { + description = "Sundials wrapper module for scikits-odes"; + homepage = "https://github.com/bmcage/odes/blob/master/packages/scikits-odes-sundials"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e0697449bad..69550a444fd5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14460,6 +14460,8 @@ self: super: with self; { scikits-odes-daepack = callPackage ../development/python-modules/scikits-odes-daepack { }; + scikits-odes-sundials = callPackage ../development/python-modules/scikits-odes-sundials { }; + scikit-tda = callPackage ../development/python-modules/scikit-tda { }; scipy = callPackage ../development/python-modules/scipy { }; From 122e9e824678d17d9a771f3acebe2f2c829c5d1c Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 1 Jan 2025 11:52:27 +0900 Subject: [PATCH 07/81] python312Packages.scikits-odes: 2.7.0 -> 3.1.0 --- .../python-modules/scikits-odes/default.nix | 63 +++++++------------ 1 file changed, 23 insertions(+), 40 deletions(-) diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index f9695701602c..43da95710011 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -1,59 +1,42 @@ { lib, + stdenv, buildPythonPackage, - fetchPypi, - pythonAtLeast, - cython, - enum34, - gfortran, - isPy27, - isPy3k, - numpy, - pytest, - python, + setuptools, scipy, - sundials, + scikits-odes-core, + scikits-odes-daepack, + scikits-odes-sundials, + pytestCheckHook, }: buildPythonPackage rec { + inherit (scikits-odes-core) version src; pname = "scikits.odes"; - version = "2.7.0"; + pyproject = true; - # https://github.com/bmcage/odes/issues/130 - disabled = isPy27 || pythonAtLeast "3.12"; + sourceRoot = "${src.name}/packages/scikits-odes"; - src = fetchPypi { - inherit pname version; - hash = "sha256-px4Z4UhYk3VK6MBQZoIy/MaU8XuDYC51++v3v5+XXh4="; - }; + build-system = [ setuptools ]; - nativeBuildInputs = [ - gfortran - cython + dependencies = [ + scipy + scikits-odes-core + scikits-odes-daepack + scikits-odes-sundials ]; - propagatedBuildInputs = [ - numpy - sundials - scipy - ] ++ lib.optionals (!isPy3k) [ enum34 ]; + pythonImportsCheck = [ "scikits_odes" ]; - nativeCheckInputs = [ pytest ]; + nativeCheckInputs = [ pytestCheckHook ]; - checkPhase = '' - cd $out/${python.sitePackages}/scikits/odes/tests - pytest - ''; + disabledTests = lib.optionals stdenv.hostPlatform.isAarch64 [ + # skip on aarch64, see https://github.com/bmcage/odes/issues/101 + "test_lsodi" + ]; - meta = with lib; { + meta = scikits-odes-core.meta // { description = "Scikit offering extra ode/dae solvers, as an extension to what is available in scipy"; - homepage = "https://github.com/bmcage/odes"; - license = licenses.bsd3; - maintainers = with maintainers; [ idontgetoutmuch ]; - platforms = [ - "aarch64-linux" - "x86_64-linux" - "x86_64-darwin" - ]; + homepage = "https://github.com/bmcage/odes/blob/master/packages/scikits-odes"; }; } From 71b1e045ee910b8e6410bb264a07910424ab8804 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 1 Jan 2025 13:46:05 +0900 Subject: [PATCH 08/81] python312Packages.keyrings-google-artifactregistry-auth: refactor --- .../default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix b/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix index 337d89567415..efdda3549d12 100644 --- a/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix +++ b/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix @@ -5,31 +5,28 @@ google-auth, keyring, pluggy, - pythonOlder, requests, + setuptools, setuptools-scm, - toml, }: buildPythonPackage rec { - pname = "keyrings.google-artifactregistry-auth"; + pname = "keyrings-google-artifactregistry-auth"; version = "1.1.2"; - - disabled = pythonOlder "3.6"; - pyproject = true; src = fetchPypi { - inherit pname version; + pname = "keyrings.google-artifactregistry-auth"; + inherit version; hash = "sha256-vWq7cnQNLf60pcA8OxBcb326FpyqKd7jlZaU8fAsd94="; }; - buildInputs = [ + build-system = [ + setuptools setuptools-scm - toml ]; - propagatedBuildInputs = [ + dependencies = [ google-auth keyring pluggy @@ -41,11 +38,11 @@ buildPythonPackage rec { # upstream has no tests doCheck = false; - meta = with lib; { + meta = { changelog = "https://github.com/GoogleCloudPlatform/artifact-registry-python-tools/blob/main/HISTORY.md"; description = "Python package which allows you to configure keyring to interact with Python repositories stored in Artifact Registry"; - homepage = "https://pypi.org/project/keyrings.google-artifactregistry-auth"; - license = licenses.asl20; - maintainers = with maintainers; [ lovesegfault ]; + homepage = "https://github.com/GoogleCloudPlatform/artifact-registry-python-tools"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ lovesegfault ]; }; } From ab29b89f860ea77cc75b4368eb29737f3583ab6a Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 1 Jan 2025 13:52:50 +0900 Subject: [PATCH 09/81] python312Packages.log-symbols: refactor --- .../python-modules/log-symbols/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/log-symbols/default.nix b/pkgs/development/python-modules/log-symbols/default.nix index d479c450aaf7..cad27746d127 100644 --- a/pkgs/development/python-modules/log-symbols/default.nix +++ b/pkgs/development/python-modules/log-symbols/default.nix @@ -2,30 +2,33 @@ buildPythonPackage, colorama, fetchPypi, - isPy27, lib, + setuptools, }: buildPythonPackage rec { - pname = "log_symbols"; + pname = "log-symbols"; version = "0.0.14"; - disabled = isPy27; + pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "0mh5d0igw33libfmbsr1ri1p1y644p36nwaa2w6kzrd8w5pvq2yg"; + pname = "log_symbols"; + inherit version; + hash = "sha256-zwu8b+Go5T8NF0pxa8YlxPhwQ8wh61XdinQM/iJoBVY="; }; - propagatedBuildInputs = [ colorama ]; + build-system = [ setuptools ]; + + dependencies = [ colorama ]; # Tests are not included in the PyPI distribution and the git repo does not have tagged releases doCheck = false; pythonImportsCheck = [ "log_symbols" ]; - meta = with lib; { + meta = { description = "Colored Symbols for Various Log Levels"; homepage = "https://github.com/manrajgrover/py-log-symbols"; - license = licenses.mit; - maintainers = with maintainers; [ urbas ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ urbas ]; }; } From 1b03c5a4e329efd30fad919889e6dc21324d0166 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 1 Jan 2025 13:57:34 +0900 Subject: [PATCH 10/81] python312Packages.mdx-truly-sane-lists: refactor --- .../mdx-truly-sane-lists/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix b/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix index 7787892efdaa..f181e9eaf1ad 100644 --- a/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix +++ b/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix @@ -2,38 +2,40 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, markdown, - python, + pytestCheckHook, }: buildPythonPackage rec { - pname = "mdx_truly_sane_lists"; + pname = "mdx-truly-sane-lists"; version = "1.3"; + pyproject = true; src = fetchFromGitHub { owner = "radude"; repo = "mdx_truly_sane_lists"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-hPnqF1UA4peW8hzeFiMlsBPfodC1qJXETGoq2yUm7d4="; }; - propagatedBuildInputs = [ markdown ]; + build-system = [ setuptools ]; + + dependencies = [ markdown ]; pythonImportsCheck = [ "mdx_truly_sane_lists" ]; - checkPhase = '' - runHook preCheck - ${python.interpreter} mdx_truly_sane_lists/tests.py - runHook postCheck - ''; + nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + pytestFlagsArray = [ "mdx_truly_sane_lists/tests.py" ]; + + meta = { description = "Extension for Python-Markdown that makes lists truly sane"; longDescription = '' Features custom indents for nested lists and fix for messy linebreaks and paragraphs between lists. ''; - license = licenses.mit; - maintainers = with maintainers; [ kaction ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kaction ]; }; } From 5c1cbe1bd9ce4ff8cfafb72d45143cabfb1a1250 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 1 Jan 2025 14:15:26 +0900 Subject: [PATCH 11/81] python312Packages.pygments-better-html: refactor --- .../pygments-better-html/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pygments-better-html/default.nix b/pkgs/development/python-modules/pygments-better-html/default.nix index 488126dbe18d..d58dabf269a1 100644 --- a/pkgs/development/python-modules/pygments-better-html/default.nix +++ b/pkgs/development/python-modules/pygments-better-html/default.nix @@ -2,31 +2,34 @@ lib, buildPythonPackage, fetchPypi, + setuptools, pygments, - isPy3k, }: buildPythonPackage rec { - pname = "pygments_better_html"; + pname = "pygments-better-html"; version = "0.1.5"; - disabled = !isPy3k; + pyproject = true; src = fetchPypi { - inherit pname version; + pname = "pygments_better_html"; + inherit version; hash = "sha256-SLAe5ubIGEchUNoHCct6CWisBja3WNEfpE48v9CTzPQ="; }; - propagatedBuildInputs = [ pygments ]; + build-system = [ setuptools ]; + + dependencies = [ pygments ]; # has no tests doCheck = false; pythonImportsCheck = [ "pygments_better_html" ]; - meta = with lib; { + meta = { homepage = "https://github.com/Kwpolska/pygments_better_html"; description = "Improved line numbering for Pygments’ HTML formatter"; - license = licenses.bsd3; - maintainers = with maintainers; [ hexa ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ hexa ]; }; } From 90ca6cce4a68ff51e1d17b76c95aad1a9ae7c726 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 1 Jan 2025 14:46:08 +0900 Subject: [PATCH 12/81] python312Packages.scrap-engine: refactor --- .../python-modules/scrap-engine/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/scrap-engine/default.nix b/pkgs/development/python-modules/scrap-engine/default.nix index d1ca60e1bf43..0a8c9fed90e8 100644 --- a/pkgs/development/python-modules/scrap-engine/default.nix +++ b/pkgs/development/python-modules/scrap-engine/default.nix @@ -2,24 +2,35 @@ lib, buildPythonPackage, fetchPypi, + setuptools, setuptools-scm, }: buildPythonPackage rec { - pname = "scrap_engine"; + pname = "scrap-engine"; version = "1.4.1"; + pyproject = true; src = fetchPypi { - inherit pname version; + pname = "scrap_engine"; + inherit version; hash = "sha256-qxzbVYFcSKcL2HtMlH9epO/sCx9HckWAt/NyVD8QJBQ="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - meta = with lib; { - maintainers = with maintainers; [ fgaz ]; + pythonImportsCheck = [ "scrap_engine" ]; + + # raise scrap_engine.CoordinateError + doCheck = false; + + meta = { + maintainers = with lib.maintainers; [ fgaz ]; description = "2D ascii game engine for the terminal"; homepage = "https://github.com/lxgr-linux/scrap_engine"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; }; } From 4bd75eabc31b3ea50a11e14d348562dd2a222f71 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 1 Jan 2025 16:03:40 +0900 Subject: [PATCH 13/81] python312Packages.jupyter-telemetry: refactor --- .../jupyter-telemetry/default.nix | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-telemetry/default.nix b/pkgs/development/python-modules/jupyter-telemetry/default.nix index c6c73084b12a..660890c55e67 100644 --- a/pkgs/development/python-modules/jupyter-telemetry/default.nix +++ b/pkgs/development/python-modules/jupyter-telemetry/default.nix @@ -1,35 +1,50 @@ { lib, buildPythonPackage, - fetchPypi, - pythonOlder, + fetchFromGitHub, + setuptools, python-json-logger, jsonschema, ruamel-yaml, traitlets, + pytestCheckHook, }: buildPythonPackage rec { - pname = "jupyter_telemetry"; + pname = "jupyter-telemetry"; version = "0.1.0"; - disabled = pythonOlder "3.5"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "052khyn6h97jxl3k5i2m81xvga5v6vwh5qixzrax4w6zwcx62p24"; + src = fetchFromGitHub { + owner = "jupyter"; + repo = "telemetry"; + tag = "v${version}"; + hash = "sha256-WxTlTs6gE9pa0hbl29Zvwikobz1/2JQ3agYO7WxyZ2E="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ python-json-logger jsonschema ruamel-yaml traitlets ]; - meta = with lib; { + pythonImportsCheck = [ "jupyter_telemetry" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ + # AssertionError + "test_record_event" + "test_unique_logger_instances" + ]; + + meta = { description = "Telemetry for Jupyter Applications and extensions"; homepage = "https://jupyter-telemetry.readthedocs.io/"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ chiroptical ]; }; } From a2061cd37ae9bb769738e12fadbe093619eed04b Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 31 Dec 2024 01:56:45 +0900 Subject: [PATCH 14/81] python312Packages.cjkwrap: refactor --- .../python-modules/cjkwrap/default.nix | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/cjkwrap/default.nix b/pkgs/development/python-modules/cjkwrap/default.nix index 00854c3c0d69..bf93185a122e 100644 --- a/pkgs/development/python-modules/cjkwrap/default.nix +++ b/pkgs/development/python-modules/cjkwrap/default.nix @@ -1,24 +1,33 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitLab, + setuptools, }: buildPythonPackage rec { pname = "cjkwrap"; version = "2.2"; - src = fetchPypi { - pname = "CJKwrap"; - inherit version; - sha256 = "1b603sg6c2gv9vmlxwr6r1qvhadqk3qp6vifmijris504zjx5ix2"; + pyproject = true; + + src = fetchFromGitLab { + owner = "fgallaire"; + repo = "cjkwrap"; + rev = "v${version}"; + hash = "sha256-0wTx3rnlUfQEE2/Z8Y7iwlsHk+CIy6ut+QIpC5yg4aM="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "cjkwrap" ]; - meta = with lib; { + # no tests + doCheck = false; + + meta = { description = "Library for wrapping and filling CJK text"; homepage = "https://f.gallai.re/cjkwrap"; - license = licenses.lgpl3Plus; - maintainers = [ maintainers.kaction ]; + license = lib.licenses.lgpl3Plus; + maintainers = [ lib.maintainers.kaction ]; }; } From c447792f28bd3bf3c2c8af2eef99539bb3acb65e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jan 2025 22:08:26 +0100 Subject: [PATCH 15/81] jwt-cli: refactor --- pkgs/tools/security/jwt-cli/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 561dc0b50f2d..9fc3f9c84416 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "mike-engel"; - repo = pname; - rev = version; - sha256 = "sha256-2pYCNLopvIHcKiN4qewQCdkGWHYQ6vQVCaApxGsRG9E="; + repo = "jwt-cli"; + tag = version; + hash = "sha256-2pYCNLopvIHcKiN4qewQCdkGWHYQ6vQVCaApxGsRG9E="; }; cargoHash = "sha256-M/9b+iPufq0S7P2PdPYIDS1to5WAtJbS3O/+NfO3sbY="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ Security ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd jwt \ @@ -41,7 +41,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Super fast CLI tool to decode and encode JWTs"; homepage = "https://github.com/mike-engel/jwt-cli"; - license = with licenses; [ mit ]; + changelog = "https://github.com/mike-engel/jwt-cli/releases/tag/${version}"; + license = licenses.mit; maintainers = with maintainers; [ rycee ]; mainProgram = "jwt"; }; From 23a675ee8313427610cf129dd2b52a69bf6a2a26 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Sun, 5 Jan 2025 23:53:59 +0100 Subject: [PATCH 16/81] tree-sitter-grammars: add kdl --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 + .../tree-sitter/grammars/tree-sitter-kdl.json | 12 ++++++++++++ .../development/tools/parsing/tree-sitter/update.nix | 4 ++++ 3 files changed, 17 insertions(+) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 161faf250d6c..37288631397c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -54,6 +54,7 @@ tree-sitter-jsonnet = lib.importJSON ./tree-sitter-jsonnet.json; tree-sitter-julia = lib.importJSON ./tree-sitter-julia.json; tree-sitter-just = lib.importJSON ./tree-sitter-just.json; + tree-sitter-kdl = lib.importJSON ./tree-sitter-kdl.json; tree-sitter-koka = lib.importJSON ./tree-sitter-koka.json; tree-sitter-kotlin = lib.importJSON ./tree-sitter-kotlin.json; tree-sitter-latex = lib.importJSON ./tree-sitter-latex.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json new file mode 100644 index 000000000000..6838779aa463 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json @@ -0,0 +1,12 @@ +{ + "url": "https://github.com/tree-sitter-grammars/tree-sitter-kdl", + "rev": "3ca569b9f9af43593c24f9e7a21f02f43a13bb88", + "date": "2023-05-13T01:55:45-04:00", + "path": "/nix/store/gmz9dnqxagdk59hqz7n9cyg43n7v0x93-tree-sitter-kdl", + "sha256": "1015x24ffrvzb0m0wbqdzmaqavpnjw0gvcagxi9b6vj3n1ynm0ps", + "hash": "sha256-+oJqfbBDbrNS7E+x/QCX9m6FVf0NLw4qWH9n54joJYA=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index b323af069d21..075ce4756b30 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -466,6 +466,10 @@ let orga = "tree-sitter-grammars"; repo = "tree-sitter-hyprlang"; }; + "tree-sitter-kdl" = { + orga = "tree-sitter-grammars"; + repo = "tree-sitter-kdl"; + }; }; allGrammars = From aa1203429f56d2e816a77fda34f069705e975f97 Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 31 Dec 2024 18:28:26 +0100 Subject: [PATCH 17/81] orca-slicer: fix gcc14 --- pkgs/by-name/or/orca-slicer/package.nix | 258 +++++++++++++++--- .../or/orca-slicer/patches/fix-boost.patch | 60 ++++ 2 files changed, 273 insertions(+), 45 deletions(-) create mode 100644 pkgs/by-name/or/orca-slicer/patches/fix-boost.patch diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index d6d8c4a93847..73ed55bb1a79 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -1,52 +1,220 @@ { + stdenv, lib, + binutils, fetchFromGitHub, - bambu-studio, + cmake, + pkg-config, + wrapGAppsHook3, + boost, + cereal, + cgal, + curl, + dbus, + eigen, + expat, + ffmpeg, + gcc-unwrapped, + glew, + glfw, + glib, + glib-networking, + gmp, + gst_all_1, + gtest, + gtk3, + hicolor-icon-theme, + ilmbase, + libpng, + mesa, + mpfr, + nlopt, + opencascade-occt_7_6, + openvdb, + opencv, + pcre, + systemd, + tbb_2021_11, + webkitgtk_4_0, + wxGTK31, + xorg, + withSystemd ? stdenv.hostPlatform.isLinux, }: -bambu-studio.overrideAttrs ( - finalAttrs: previousAttrs: { - version = "2.2.0"; - pname = "orca-slicer"; +let + wxGTK' = + (wxGTK31.override { + withCurl = true; + withPrivateFonts = true; + withWebKit = true; + }).overrideAttrs + (old: { + configureFlags = old.configureFlags ++ [ + # Disable noisy debug dialogs + "--enable-debug=no" + ]; + }); +in +stdenv.mkDerivation rec { + pname = "orca-slicer"; + version = "v2.2.0-unstable-2025-01-06"; - src = fetchFromGitHub { - owner = "SoftFever"; - repo = "OrcaSlicer"; - rev = "v${finalAttrs.version}"; - hash = "sha256-h+cHWhrp894KEbb3ic2N4fNTn13WlOSYoMsaof0RvRI="; - }; + src = fetchFromGitHub { + owner = "SoftFever"; + repo = "OrcaSlicer"; + rev = "99a0facfb3a5c9b4e661e536825c08393053cb53"; + hash = "sha256-XWM04Vx65q+Vc+s3YLucS63IhGVw8ODhL2m+47nZKs8="; + }; - patches = [ - # Fix for webkitgtk linking - ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch - ./patches/dont-link-opencv-world-orca.patch + nativeBuildInputs = [ + cmake + pkg-config + wrapGAppsHook3 + wxGTK' + ]; + + buildInputs = + [ + binutils + (boost.override { + enableShared = true; + enableStatic = false; + extraFeatures = [ + "log" + "thread" + "filesystem" + ]; + }) + boost.dev + cereal + cgal + curl + dbus + eigen + expat + ffmpeg + gcc-unwrapped + glew + glfw + glib + glib-networking + gmp + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-good + gtk3 + hicolor-icon-theme + ilmbase + libpng + mesa + mesa.osmesa + mesa.drivers + mpfr + nlopt + opencascade-occt_7_6 + openvdb + pcre + tbb_2021_11 + webkitgtk_4_0 + wxGTK' + xorg.libX11 + opencv + ] + ++ lib.optionals withSystemd [ systemd ] + ++ checkInputs; + + patches = [ + # Fix for webkitgtk linking + ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch + ./patches/dont-link-opencv-world-orca.patch + ./patches/fix-boost.patch + ]; + + doCheck = true; + checkInputs = [ gtest ]; + + separateDebugInfo = true; + + NLOPT = nlopt; + + NIX_CFLAGS_COMPILE = toString [ + "-Wno-ignored-attributes" + "-I${opencv.out}/include/opencv4" + "-Wno-error=template-id-cdtor" + "-Wno-error=incompatible-pointer-types" + "-Wno-template-id-cdtor" + "-Wno-uninitialized" + "-Wno-unused-result" + "-Wno-deprecated-declarations" + "-Wno-use-after-free" + "-Wno-format-overflow" + "-Wno-stringop-overflow" + "-DBOOST_ALLOW_DEPRECATED_HEADERS" + "-DBOOST_MATH_DISABLE_STD_FPCLASSIFY" + "-DBOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS" + "-DBOOST_MATH_DISABLE_FLOAT128" + "-DBOOST_MATH_NO_QUAD_SUPPORT" + "-DBOOST_MATH_MAX_FLOAT128_DIGITS=0" + "-DBOOST_CSTDFLOAT_NO_LIBQUADMATH_SUPPORT" + "-DBOOST_MATH_DISABLE_FLOAT128_BUILTIN_FPCLASSIFY" + ]; + + NIX_LDFLAGS = toString [ + (lib.optionalString withSystemd "-ludev") + "-L${mesa.osmesa}/lib" + "-L${mesa.drivers}/lib" + "-L${boost}/lib" + "-lboost_log" + "-lboost_log_setup" + ]; + + prePatch = '' + sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake + ''; + + cmakeFlags = [ + "-DSLIC3R_STATIC=0" + "-DSLIC3R_FHS=1" + "-DSLIC3R_GTK=3" + "-DBBL_RELEASE_TO_PUBLIC=1" + "-DBBL_INTERNAL_TESTING=0" + "-DDEP_WX_GTK3=ON" + "-DSLIC3R_BUILD_TESTS=0" + "-DCMAKE_CXX_FLAGS=-DBOOST_LOG_DYN_LINK" + "-DBOOST_LOG_DYN_LINK=1" + "-DBOOST_ALL_DYN_LINK=1" + "-DBOOST_LOG_NO_LIB=OFF" + "-DCMAKE_CXX_FLAGS=-DGL_SILENCE_DEPRECATION" + "-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-as-needed" + "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${mesa.drivers}/lib -Wl,-rpath,${mesa.osmesa}/lib" + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "$out/lib:${ + lib.makeLibraryPath [ + mesa.drivers + mesa.osmesa + glew + ] + }" + --prefix LIBGL_DRIVERS_PATH : "${mesa.drivers}/lib/dri" + --set WEBKIT_DISABLE_COMPOSITING_MODE 1 + ) + ''; + + meta = { + description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)"; + homepage = "https://github.com/SoftFever/OrcaSlicer"; + changelog = "https://github.com/SoftFever/OrcaSlicer/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + zhaofengli + ovlach + pinpox + liberodark ]; - - preFixup = '' - gappsWrapperArgs+=( - # Fixes blackscreen dialogs - --set WEBKIT_DISABLE_COMPOSITING_MODE 1 - ) - ''; - - cmakeFlags = lib.remove "-DFLATPAK=1" previousAttrs.cmakeFlags or [ ]; - - # needed to prevent collisions between the LICENSE.txt files of - # bambu-studio and orca-slicer. - postInstall = '' - mv $out/LICENSE.txt $out/share/OrcaSlicer/LICENSE.txt - ''; - - meta = with lib; { - description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)"; - homepage = "https://github.com/SoftFever/OrcaSlicer"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ - zhaofengli - ovlach - pinpox - ]; - mainProgram = "orca-slicer"; - platforms = platforms.linux; - }; - } -) + mainProgram = "orca-slicer"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/or/orca-slicer/patches/fix-boost.patch b/pkgs/by-name/or/orca-slicer/patches/fix-boost.patch new file mode 100644 index 000000000000..aaced2fe79e5 --- /dev/null +++ b/pkgs/by-name/or/orca-slicer/patches/fix-boost.patch @@ -0,0 +1,60 @@ +diff --git a/src/libslic3r/PrintBase.cpp b/src/libslic3r/PrintBase.cpp +index 25b282c7b..81ee858c2 100644 +--- a/src/libslic3r/PrintBase.cpp ++++ b/src/libslic3r/PrintBase.cpp +@@ -79,7 +79,7 @@ std::string PrintBase::output_filename(const std::string &format, const std::str + cfg.opt_string("input_filename_base") + default_ext : + this->placeholder_parser().process(format, 0, &cfg); + if (filename.extension().empty()) +- filename = boost::filesystem::change_extension(filename, default_ext); ++ filename.replace_extension(default_ext); + return filename.string(); + } catch (std::runtime_error &err) { + throw Slic3r::PlaceholderParserError(L("Failed processing of the filename_format template.") + "\n" + err.what()); +diff --git a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp +index 50368b854..cad5cf545 100644 +--- a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp ++++ b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp +@@ -337,7 +337,7 @@ wxDataViewItemArray AuxiliaryModel::ImportFile(AuxiliaryModelNode* sel, wxArrayS + dir_path += "\\" + src_bfs_path.filename().generic_wstring(); + + boost::system::error_code ec; +- if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_option::overwrite_if_exists, ec)) ++ if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_options::overwrite_existing, ec)) + continue; + + // Update model data +diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp +index f3782be14..e12f0c321 100644 +--- a/src/slic3r/GUI/Plater.cpp ++++ b/src/slic3r/GUI/Plater.cpp +@@ -10265,7 +10265,7 @@ bool Plater::preview_zip_archive(const boost::filesystem::path& archive_path) + std::replace(name.begin(), name.end(), '\\', '/'); + // rename if file exists + std::string filename = path.filename().string(); +- std::string extension = boost::filesystem::extension(path); ++ std::string extension = path.extension().string(); + std::string just_filename = filename.substr(0, filename.size() - extension.size()); + std::string final_filename = just_filename; + +diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp +index a26e13448..83ec4695c 100644 +--- a/src/slic3r/GUI/RemovableDriveManager.cpp ++++ b/src/slic3r/GUI/RemovableDriveManager.cpp +@@ -22,7 +22,6 @@ + #include + #include + #include +-#include + #include + #endif + +@@ -202,7 +201,7 @@ namespace search_for_drives_internal + stat(path.c_str(), &buf); + uid_t uid = buf.st_uid; + if (getuid() == uid) +- out.emplace_back(DriveData{ boost::filesystem::basename(boost::filesystem::path(path)), path }); ++ out.emplace_back(DriveData{ boost::filesystem::path(path).stem().string(), path }); + } + } + } From 81e43efe2804065aef1e3e18d7b7bceb79aa787c Mon Sep 17 00:00:00 2001 From: Marcel Date: Mon, 6 Jan 2025 13:14:43 +0100 Subject: [PATCH 18/81] arouteserver: disable copyright year test --- pkgs/by-name/ar/arouteserver/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ar/arouteserver/package.nix b/pkgs/by-name/ar/arouteserver/package.nix index 99c976e8ec71..19f6df88a431 100644 --- a/pkgs/by-name/ar/arouteserver/package.nix +++ b/pkgs/by-name/ar/arouteserver/package.nix @@ -48,6 +48,11 @@ python3Packages.buildPythonPackage rec { pytestFlagsArray = [ "tests/static" ]; + disabledTests = [ + # disable copyright year check of files + "current_year" + ]; + meta = { description = "Automatically build (and test) feature-rich configurations for BGP route servers"; mainProgram = "arouteserver"; From 90b1a0b35395e344e2a5fb7fa6fcde37e776483b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Mon, 30 Sep 2024 19:18:43 +0200 Subject: [PATCH 19/81] python3Packages.pyfatfs: init at 1.1.0 This is a dependency for Unblob (#217836) --- .../python-modules/pyfatfs/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/pyfatfs/default.nix diff --git a/pkgs/development/python-modules/pyfatfs/default.nix b/pkgs/development/python-modules/pyfatfs/default.nix new file mode 100644 index 000000000000..0d1914c58efa --- /dev/null +++ b/pkgs/development/python-modules/pyfatfs/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + gitUpdater, + setuptools, + setuptools-scm, + fs, + pytestCheckHook, + pytest-mock, +}: + +buildPythonPackage rec { + pname = "pyfatfs"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nathanhi"; + repo = "pyfatfs"; + tag = "v${version}"; + hash = "sha256-26b4EV3WERUqJ10VkYov3PDFhSBcfxCF79P8Eg5xpoM="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ fs ]; + + postPatch = '' + substituteInPlace ./pyproject.toml \ + --replace-fail 'setuptools ~= 67.8' setuptools \ + --replace-fail '"setuptools_scm[toml] ~= 7.1"' "" + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + description = "Python based FAT12/FAT16/FAT32 implementation with VFAT support"; + homepage = "https://github.com/nathanhi/pyfatfs"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ vlaci ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e40bb1c76dbb..806bcbca373d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11705,6 +11705,8 @@ self: super: with self; { pyfantom = callPackage ../development/python-modules/pyfantom { }; + pyfatfs = callPackage ../development/python-modules/pyfatfs { }; + pyfcm = callPackage ../development/python-modules/pyfcm { }; pyfido = callPackage ../development/python-modules/pyfido { }; From dcd0629aa1ce1c04bb73f63e6ae45a543d5d5fb4 Mon Sep 17 00:00:00 2001 From: genga Date: Wed, 8 Jan 2025 15:54:26 +0300 Subject: [PATCH 20/81] flow-editor: init at 0.2.1 --- pkgs/by-name/fl/flow-editor/build.zig.zon.nix | 195 ++++++++++++++++++ pkgs/by-name/fl/flow-editor/package.nix | 37 ++++ 2 files changed, 232 insertions(+) create mode 100644 pkgs/by-name/fl/flow-editor/build.zig.zon.nix create mode 100644 pkgs/by-name/fl/flow-editor/package.nix diff --git a/pkgs/by-name/fl/flow-editor/build.zig.zon.nix b/pkgs/by-name/fl/flow-editor/build.zig.zon.nix new file mode 100644 index 000000000000..e7adff45a777 --- /dev/null +++ b/pkgs/by-name/fl/flow-editor/build.zig.zon.nix @@ -0,0 +1,195 @@ +# generated by zon2nix (https://github.com/Cloudef/zig2nix) + +{ + lib, + linkFarm, + fetchurl, + fetchgit, + runCommandLocal, + zig, + name ? "zig-packages", +}: + +with builtins; +with lib; + +let + unpackZigArtifact = + { name, artifact }: + runCommandLocal name + { + nativeBuildInputs = [ zig ]; + } + '' + hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})" + mv "$TMPDIR/p/$hash" "$out" + chmod 755 "$out" + ''; + + fetchZig = + { + name, + url, + hash, + }: + let + artifact = fetchurl { inherit url hash; }; + in + unpackZigArtifact { inherit name artifact; }; + + fetchGitZig = + { + name, + url, + hash, + }: + let + parts = splitString "#" url; + url_base = elemAt parts 0; + url_without_query = elemAt (splitString "?" url_base) 0; + rev_base = elemAt parts 1; + rev = if match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}"; + in + fetchgit { + inherit name rev hash; + url = url_without_query; + deepClone = false; + }; + + fetchZigArtifact = + { + name, + url, + hash, + }: + let + parts = splitString "://" url; + proto = elemAt parts 0; + path = elemAt parts 1; + fetcher = { + "git+http" = fetchGitZig { + inherit name hash; + url = "http://${path}"; + }; + "git+https" = fetchGitZig { + inherit name hash; + url = "https://${path}"; + }; + http = fetchZig { + inherit name hash; + url = "http://${path}"; + }; + https = fetchZig { + inherit name hash; + url = "https://${path}"; + }; + }; + in + fetcher.${proto}; +in +linkFarm name [ + { + name = "1220930a42f8da3fb7f723e3ad3f6dcc6db76327dd8d26274566423192d53e91b2bb"; + path = fetchZigArtifact { + name = "flags"; + url = "https://github.com/n0s4/flags/archive/b3905aa990719ff567f1c5a2f89e6dd3292d8533.tar.gz"; + hash = "sha256-2lN2goQgjU5Hf18tvDV/csS83A20nA9Iu2/fKXtpZok="; + }; + } + { + name = "1220a2c8f8db1b5265458ac967ea1f7cc0a8ddcd1d774df3b73d86c4f529aadbfb94"; + path = fetchZigArtifact { + name = "tracy"; + url = "https://github.com/neurocyte/zig-tracy/archive/58999b786089e5319dd0707f6afbfca04c6340e7.tar.gz"; + hash = "sha256-4q1UD2hRtp9mUPL5wIKzk8AhnAoVkl9xpaUN5sp4mWA="; + }; + } + { + name = "12202aac930cebaf2b57f443cacc2483478580a72f1316b4f0a720ddd91246fce69d"; + path = fetchZigArtifact { + name = "tracy_src"; + url = "https://github.com/wolfpld/tracy/archive/refs/tags/v0.10.tar.gz"; + hash = "sha256-p2AX2Sjz8nJ1QPuVDt07c2yql7Etu05e3OZlQsvqZgA="; + }; + } + { + name = "1220220dbc7fe91c1c54438193ca765cebbcb7d58f35cdcaee404a9d2245a42a4362"; + path = fetchZigArtifact { + name = "dizzy"; + url = "https://github.com/neurocyte/dizzy/archive/455d18369cbb2a0458ba70be919cd378338d695e.tar.gz"; + hash = "sha256-PKCqS8/sEieEA3ZONEsBHq+am02JRHG9waYzn2GnYgI="; + }; + } + { + name = "1220f6fdc977fff899aaf624afc8cf01e29a0e100dbb52860902a3bc256f4ddd687b"; + path = fetchZigArtifact { + name = "thespian"; + url = "https://github.com/neurocyte/thespian/archive/9df7beb192dd0db647e55fe44272b77ca687f6cd.tar.gz"; + hash = "sha256-b8PPqmiURT9bOaa2ubz/v0J2WEyRmtL6iL4nBDkvgeQ="; + }; + } + { + name = "1220c85e0d9438ec518849c84e3ea66633a0e191e49c4ae4bbb3bc46626cd8dfad75"; + path = fetchZigArtifact { + name = "asio"; + url = "https://github.com/neurocyte/asio/archive/b9c9c23ef2e6f11b6123535ec33e5a23ed0c59da.tar.gz"; + hash = "sha256-tD9lxE6RRAptBE9suZA4ANpT5x/B3e4YINay9Se78XY="; + }; + } + { + name = "1220b2109e0aadf85e4ac5e1cd084e321fe50f1e59cea690c022a7a8f7eb6021eadb"; + path = fetchZigArtifact { + name = "themes"; + url = "https://github.com/neurocyte/flow-themes/releases/download/master-0c2a187c604c63031225847a966b6ca279b2be91/flow-themes.tar.gz"; + hash = "sha256-8zumZneeSPVrpw2wAQwKoEOXCLYqkKQFVXQ8oum08Hw="; + }; + } + { + name = "122019f077d09686b1ec47928ca2b4bf264422f3a27afc5b49dafb0129a4ceca0d01"; + path = fetchZigArtifact { + name = "fuzzig"; + url = "https://github.com/fjebaker/fuzzig/archive/0fd156d5097365151e85a85eef9d8cf0eebe7b00.tar.gz"; + hash = "sha256-XVOKqHX2X8HvRDJgnqVEPN/A0hFvCk8Fgsss0CKInYQ="; + }; + } + { + name = "12202ee9842d28927674e552f1ea41e2c41e59f6b4b5d290de9b6fd626fd332ac627"; + path = fetchZigArtifact { + name = "vaxis"; + url = "https://github.com/neurocyte/libvaxis/archive/ffe35b4342bd2913efd46c35c0ccd15544ac87e6.tar.gz"; + hash = "sha256-AQpYS1WnHLzcUMhD8BaCd+Dh+nqY5umL6KCBTuVlSQw="; + }; + } + { + name = "1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5"; + path = fetchZigArtifact { + name = "zigimg"; + url = "git+https://github.com/zigimg/zigimg#3a667bdb3d7f0955a5a51c8468eac83210c1439e"; + hash = "sha256-oLf3YH3yeg4ikVO/GahMCDRMTU31AHkfSnF4rt7xTKo="; + }; + } + { + name = "122055beff332830a391e9895c044d33b15ea21063779557024b46169fb1984c6e40"; + path = fetchZigArtifact { + name = "zg"; + url = "https://github.com/neurocyte/zg/archive/refs/tags/v0.13.2.tar.gz"; + hash = "sha256-Hd8HlYEkkA/2BLW+4d/0Ibw7r7U533us3n2QR+XG/PQ="; + }; + } + { + name = "1220755ea2a5aa6bb3713437aaafefd44812169fe43f1da755c3ee6101b85940f441"; + path = fetchZigArtifact { + name = "zeit"; + url = "https://github.com/rockorager/zeit/archive/9cca8ec620a54c3b07cd249f25e5bcb3153d03d7.tar.gz"; + hash = "sha256-4bxyQKbVUtYzZixUq2d+iiSPGkcwg+dG4WLaDYYQzn8="; + }; + } + { + name = "12204c99c6093230023380068f386f7eb32ab83df9a8eb8b586ffe5aa44afa34ff0e"; + path = fetchZigArtifact { + name = "tree-sitter"; + url = "https://github.com/neurocyte/tree-sitter/releases/download/master-aea6072c6178d5cd0c97fff33e130f632f355bc2/source.tar.gz"; + hash = "sha256-eqJc3lx+tnbiqcD8R0u4+sH7wKOr4McYiZNUfPTNbRc="; + }; + } +] diff --git a/pkgs/by-name/fl/flow-editor/package.nix b/pkgs/by-name/fl/flow-editor/package.nix new file mode 100644 index 000000000000..358ed66f4103 --- /dev/null +++ b/pkgs/by-name/fl/flow-editor/package.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitHub, + stdenv, + zig_0_13, + callPackage, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "flow"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "neurocyte"; + repo = "flow"; + tag = "v${finalAttrs.version}"; + hash = "sha256-dXWqxV66BwtjOvmreq4+u5+xBI+1v1PAep8RQBK3rlA="; + }; + postPatch = '' + ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p + ''; + + nativeBuildInputs = [ + zig_0_13.hook + ]; + + env.VERSION = finalAttrs.version; + + meta = { + description = "Programmer's text editor"; + homepage = "https://github.com/neurocyte/flow"; + changelog = "https://github.com/neurocyte/flow/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "flow"; + }; +}) From d7c30b3bf11f062333e1ed60496cd024395d3420 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jan 2025 13:44:38 +0000 Subject: [PATCH 21/81] openscap: 1.4.0 -> 1.4.1 --- pkgs/by-name/op/openscap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openscap/package.nix b/pkgs/by-name/op/openscap/package.nix index 5e70ea78a9b7..92df65d4a402 100644 --- a/pkgs/by-name/op/openscap/package.nix +++ b/pkgs/by-name/op/openscap/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "openscap"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "OpenSCAP"; repo = "openscap"; rev = version; - hash = "sha256-LYDXASy1yZA+GfUKaXUKyZgdRqGERvMeyVIHJFfCfII="; + hash = "sha256-omPGm3VSLmwEIzInIORLfJf7wreRyxbDOXTRl05mAz0="; }; strictDeps = true; From 0d8676b6a426eba8004309469374897416eb7a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Mon, 30 Sep 2024 19:19:53 +0200 Subject: [PATCH 22/81] unblob: init at 25.1.8 Resolves: #217836 --- pkgs/by-name/un/unblob/package.nix | 129 ++++++++++++++++++ .../python-modules/unblob-native/default.nix | 46 +++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 177 insertions(+) create mode 100644 pkgs/by-name/un/unblob/package.nix create mode 100644 pkgs/development/python-modules/unblob-native/default.nix diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix new file mode 100644 index 000000000000..0dc24850b9ae --- /dev/null +++ b/pkgs/by-name/un/unblob/package.nix @@ -0,0 +1,129 @@ +{ + lib, + fetchpatch, + python3, + fetchFromGitHub, + gitUpdater, + makeWrapper, + e2fsprogs, + jefferson, + lz4, + lziprecover, + lzop, + p7zip, + sasquatch, + sasquatch-v4be, + simg2img, + ubi_reader, + unar, + zstd, + versionCheckHook, +}: + +let + # These dependencies are only added to PATH + runtimeDeps = [ + e2fsprogs + jefferson + lziprecover + lzop + p7zip + sasquatch + sasquatch-v4be + ubi_reader + simg2img + unar + zstd + lz4 + ]; +in +python3.pkgs.buildPythonApplication rec { + pname = "unblob"; + version = "25.1.8"; + pyproject = true; + disabled = python3.pkgs.pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "onekey-sec"; + repo = "unblob"; + tag = version; + hash = "sha256-PGpJPAo9q52gQ3EGusYtDA2e0MG5kFClqCYPB2DvuMs="; + forceFetchGit = true; + fetchLFS = true; + }; + + strictDeps = true; + + build-system = with python3.pkgs; [ poetry-core ]; + + dependencies = with python3.pkgs; [ + arpy + attrs + click + cryptography + dissect-cstruct + lark + lief.py + python3.pkgs.lz4 # shadowed by pkgs.lz4 + plotext + pluggy + pyfatfs + pyperscan + python-magic + rarfile + rich + structlog + treelib + unblob-native + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + # These are runtime-only CLI dependencies, which are used through + # their CLI interface + pythonRemoveDeps = [ + "jefferson" + "ubi-reader" + ]; + + pythonImportsCheck = [ "unblob" ]; + + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath runtimeDeps}" + ]; + + nativeCheckInputs = + with python3.pkgs; + [ + pytestCheckHook + pytest-cov + versionCheckHook + ] + ++ runtimeDeps; + + versionCheckProgramArg = "--version"; + + pytestFlagsArray = [ + "--no-cov" + # `disabledTests` swallows the parameters between square brackets + # https://github.com/tytso/e2fsprogs/issues/152 + "-k 'not test_all_handlers[filesystem.extfs]'" + ]; + + passthru = { + updateScript = gitUpdater { }; + # helpful to easily add these to a nix-shell environment + inherit runtimeDeps; + }; + + meta = { + description = "Extract files from any kind of container formats"; + homepage = "https://unblob.org"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + mainProgram = "unblob"; + maintainers = with lib.maintainers; [ vlaci ]; + }; +} diff --git a/pkgs/development/python-modules/unblob-native/default.nix b/pkgs/development/python-modules/unblob-native/default.nix new file mode 100644 index 000000000000..df754d7b3888 --- /dev/null +++ b/pkgs/development/python-modules/unblob-native/default.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenvNoCC, + buildPythonPackage, + fetchFromGitHub, + nix-update-script, + rustPlatform, + libiconv, +}: + +buildPythonPackage rec { + pname = "unblob-native"; + version = "0.1.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "onekey-sec"; + repo = "unblob-native"; + tag = "v${version}"; + hash = "sha256-jpaBxKuQNfU0I3kCs67mM5dzGURSSHvqymhk43P7xXk="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-K2QTf4OlP4AH2JJiJ6r8PRkInSOQdIBQcSvY5tWr4mw="; + }; + + nativeBuildInputs = with rustPlatform; [ + maturinBuildHook + cargoSetupHook + ]; + + buildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ libiconv ]; + + pythonImportsCheck = [ "unblob_native" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Performance sensitive parts of Unblob"; + homepage = "https://unblob.org"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ vlaci ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 806bcbca373d..87f9120085bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17489,6 +17489,8 @@ self: super: with self; { unasync = callPackage ../development/python-modules/unasync { }; + unblob-native = callPackage ../development/python-modules/unblob-native { }; + uncertainties = callPackage ../development/python-modules/uncertainties { }; uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; From 18ed4430d66c59643420bca9801b3963a61c3a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Tue, 1 Oct 2024 13:27:59 +0200 Subject: [PATCH 23/81] simg2img: 1.1.4 -> 1.1.5 To fix build on aarch64-darwin This fixes broken tests of Unblob as well --- pkgs/by-name/si/simg2img/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simg2img/package.nix b/pkgs/by-name/si/simg2img/package.nix index 69ac44257aa5..2269913ce3c3 100644 --- a/pkgs/by-name/si/simg2img/package.nix +++ b/pkgs/by-name/si/simg2img/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simg2img"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "anestisb"; repo = "android-simg2img"; rev = version; - sha256 = "1xm9kaqs2w8c7a4psv78gv66gild88mpgjn5lj087d7jh1jxy7bf"; + hash = "sha256-sNHdSbms35YnENASFEG+VMLJGkV/JAlQUVMquDrePDc="; }; buildInputs = [ zlib ]; From 9d80e3a16bdebd442bf0be5eb4dd11cd7aebaa90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Wed, 8 Jan 2025 18:14:41 +0100 Subject: [PATCH 24/81] simg2img: apply nixfmt --- pkgs/by-name/si/simg2img/package.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/simg2img/package.nix b/pkgs/by-name/si/simg2img/package.nix index 2269913ce3c3..da1617ec63f5 100644 --- a/pkgs/by-name/si/simg2img/package.nix +++ b/pkgs/by-name/si/simg2img/package.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, zlib }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + zlib, +}: stdenv.mkDerivation rec { pname = "simg2img"; @@ -13,13 +19,19 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - makeFlags = [ "PREFIX=$(out)" "DEP_CXX:=$(CXX)" ]; + makeFlags = [ + "PREFIX=$(out)" + "DEP_CXX:=$(CXX)" + ]; meta = with lib; { description = "Tool to convert Android sparse images to raw images"; homepage = "https://github.com/anestisb/android-simg2img"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ dezgeg arkivm ]; + maintainers = with maintainers; [ + dezgeg + arkivm + ]; }; } From 638fe294cdf62f860820d1c4a508d18a8c487af1 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 08:45:26 +0100 Subject: [PATCH 25/81] simg2img: fix GCC 14 build --- pkgs/by-name/si/simg2img/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/si/simg2img/package.nix b/pkgs/by-name/si/simg2img/package.nix index da1617ec63f5..a3bc4d4bdbc6 100644 --- a/pkgs/by-name/si/simg2img/package.nix +++ b/pkgs/by-name/si/simg2img/package.nix @@ -17,6 +17,17 @@ stdenv.mkDerivation rec { hash = "sha256-sNHdSbms35YnENASFEG+VMLJGkV/JAlQUVMquDrePDc="; }; + # fix GCC 14 error + # https://github.com/anestisb/android-simg2img/pull/41 + postPatch = '' + substituteInPlace backed_block.cpp \ + --replace-fail 'calloc(sizeof(struct backed_block_list), 1));' 'calloc(1, sizeof(struct backed_block_list)));' + substituteInPlace sparse.cpp \ + --replace-fail 'calloc(sizeof(struct sparse_file), 1));' 'calloc(1, sizeof(struct sparse_file)));' + substituteInPlace simg2simg.cpp \ + --replace-fail 'calloc(sizeof(struct sparse_file*), files);' 'calloc(files, sizeof(struct sparse_file*));' + ''; + buildInputs = [ zlib ]; makeFlags = [ From 9962eee3148d85764bb80cf42ea65f2ec1b4b177 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 7 Jan 2025 16:49:39 +0100 Subject: [PATCH 26/81] gitlab: 17.6.2 -> 17.7.1 https://about.gitlab.com/releases/2024/12/19/gitlab-17-7-released/ --- .../version-management/gitlab/data.json | 14 +- .../version-management/gitlab/default.nix | 2 +- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/gitlab/rubyEnv/Gemfile | 42 +-- .../gitlab/rubyEnv/Gemfile.lock | 264 +++++++++--------- .../gitlab/rubyEnv/gemset.nix | 257 +++++++++-------- pkgs/by-name/gi/gitaly/git.nix | 4 +- pkgs/by-name/gi/gitaly/package.nix | 6 +- pkgs/by-name/gi/gitlab-pages/package.nix | 6 +- 9 files changed, 314 insertions(+), 283 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index ec6422cea4f9..e752a9b775e2 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.6.2", - "repo_hash": "0j08l2rhhlm5b6cim3bq5zk6lwimf467jhqarm01mxn53qj5rfna", - "yarn_hash": "0g60lvngbvgvirjag5l539innmklh2x6a56vd38svrgx5jm6d3jc", + "version": "17.7.1", + "repo_hash": "0c800lczpfbc62scxmf0ll0y619qrdszwxdzsmyl4w14appp96mm", + "yarn_hash": "10iz5148yr1xaij78fx7j4dras35rsm4zgxw8m8fx5adg6xc86sg", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.6.2-ee", + "rev": "v17.7.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.6.2", - "GITLAB_PAGES_VERSION": "17.6.2", + "GITALY_SERVER_VERSION": "17.7.1", + "GITLAB_PAGES_VERSION": "17.7.1", "GITLAB_SHELL_VERSION": "14.39.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0", - "GITLAB_WORKHORSE_VERSION": "17.6.2" + "GITLAB_WORKHORSE_VERSION": "17.7.1" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index bf9353f5d15a..0379d5cac956 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -83,7 +83,7 @@ let cp Cargo.lock $out ''; }; - hash = "sha256-L/URWw7NoQhi7VV8ZiKLzthbF0wl4rIUqCQdH9wmAV0="; + hash = "sha256-vFApyObuqsMBXhT2yyMpH7rzW0GaPgJUn9/hE/GpS9I="; }; dontBuild = false; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 9e0a2b9a8bfc..8b3cdeedfe5a 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 = "17.6.2"; + version = "17.7.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 082319571f39..e7d9efcedf78 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -32,7 +32,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir if next? gem 'rails', '~> 7.1.4', feature_category: :shared else - gem 'rails', '~> 7.0.8.4', feature_category: :shared + gem 'rails', '~> 7.0.8.6', feature_category: :shared end gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory @@ -89,8 +89,8 @@ gem 'coverband', '6.1.4', require: false, feature_category: :shared gem 'devise', '~> 4.9.3', feature_category: :system_access gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' # rubocop:todo Gemfile/MissingFeatureCategory gem 'bcrypt', '~> 3.1', '>= 3.1.14' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'doorkeeper', '~> 5.6', '>= 5.6.6' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.7' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'doorkeeper', '~> 5.8', '>= 5.8.1', feature_category: :system_access +gem 'doorkeeper-openid_connect', '~> 1.8.10', feature_category: :system_access gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access gem 'rexml', '~> 3.3.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'ruby-saml', '~> 1.17.0', feature_category: :system_access @@ -130,10 +130,10 @@ gem 'rqrcode', '~> 2.2', feature_category: :system_access gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' # rubocop:todo Gemfile/MissingFeatureCategory # GitLab Pages -gem 'validates_hostname', '~> 1.0.13' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'rubyzip', '~> 2.3.2', require: 'zip' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'validates_hostname', '~> 1.0.13', feature_category: :pages +gem 'rubyzip', '~> 2.3.2', require: 'zip', feature_category: :pages # GitLab Pages letsencrypt support -gem 'acme-client', '~> 2.0.18' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'acme-client', '~> 2.0.19', feature_category: :pages # Browser detection gem 'browser', '~> 5.3.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -203,7 +203,7 @@ gem 'fog-local', '~> 0.8' # rubocop:todo Gemfile/MissingFeatureCategory # We may want to update this dependency if this is ever addressed upstream, e.g. via # https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93 gem 'fog-aliyun', '~> 0.4' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-fog-azure-rm', '~> 2.1.0', require: 'fog/azurerm', feature_category: :shared +gem 'gitlab-fog-azure-rm', '~> 2.2.0', require: 'fog/azurerm', feature_category: :shared # for Google storage @@ -234,9 +234,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search gem 'elasticsearch-api', '7.17.11', feature_category: :global_search -gem 'aws-sdk-core', '~> 3.211.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.213.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-s3', '~> 1.169.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-s3', '~> 1.172.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search # Used with Elasticsearch to support http keep-alive connections @@ -276,7 +276,7 @@ gem 'rack', '~> 2.2.9' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory group :puma do - gem 'puma', '= 6.4.3', require: false, feature_category: :shared + gem 'puma', '= 6.5.0', require: false, feature_category: :shared gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory end @@ -292,7 +292,7 @@ gem 'gitlab-sidekiq-fetcher', feature_category: :scalability # Cron Parser -gem 'fugit', '~> 1.8.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'fugit', '~> 1.11.1', feature_category: :continuous_integration # HTTP requests gem 'httparty', '~> 0.21.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -325,7 +325,7 @@ gem 'redis-clustering', '~> 5.3.0', feature_category: :redis gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory # Redis session store -gem 'redis-actionpack', '~> 5.4.0', feature_category: :redis +gem 'redis-actionpack', '~> 5.5.0', feature_category: :redis # Discord integration gem 'discordrb-webhooks', '~> 3.5', require: false, feature_category: :integrations @@ -380,7 +380,7 @@ gem 'addressable', '~> 2.8' # rubocop:todo Gemfile/MissingFeatureCategory gem 'gon', '~> 6.4.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'request_store', '~> 1.5.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'base32', '~> 0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-license', '~> 2.5', feature_category: :shared +gem 'gitlab-license', '~> 2.6', feature_category: :shared # Protect against bruteforcing gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -392,13 +392,13 @@ gem 'sentry-sidekiq', '~> 5.21.0', feature_category: :observability # PostgreSQL query parsing # -gem 'pg_query', '~> 5.1.0', feature_category: :database +gem 'pg_query', '~> 6.0.0', feature_category: :database gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' # rubocop:todo Gemfile/MissingFeatureCategory gem 'gitlab-http', path: 'gems/gitlab-http' # rubocop:todo Gemfile/MissingFeatureCategory gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications -gem 'gitlab-labkit', '~> 0.36.0', feature_category: :shared +gem 'gitlab-labkit', '~> 0.37.0', feature_category: :shared gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory # I18n @@ -480,7 +480,7 @@ group :development do gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'ruby-lsp', "~> 0.19.0", require: false, feature_category: :tooling + gem 'ruby-lsp', "~> 0.21.0", require: false, feature_category: :tooling gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling @@ -509,7 +509,7 @@ group :development, :test do gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab-styles', '~> 13.0.1', feature_category: :tooling + gem 'gitlab-styles', '~> 13.0.2', feature_category: :tooling gem 'haml_lint', '~> 0.58', feature_category: :tooling gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory @@ -592,7 +592,7 @@ group :test do # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab_quality-test_tooling', '~> 2.1.0', require: false, feature_category: :tooling + gem 'gitlab_quality-test_tooling', '~> 2.4.0', require: false, feature_category: :tooling end gem 'octokit', '~> 9.0', feature_category: :importers @@ -632,7 +632,7 @@ gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'gitaly', '~> 17.5.0.pre.rc1', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 17.5.0', feature_category: :deployment_management +gem 'gitlab-kas-grpc', '~> 17.6.1', feature_category: :deployment_management # Lock the version before issues below are resolved: # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 @@ -685,7 +685,7 @@ gem 'lockbox', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'valid_email', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory # JSON -gem 'jsonb_accessor', '~> 1.3.10' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'jsonb_accessor', '~> 1.4' # rubocop:todo Gemfile/MissingFeatureCategory gem 'json', '~> 2.7.2', feature_category: :shared gem 'json_schemer', '~> 2.3.0', feature_category: :shared gem 'oj', '~> 3.13.21' # rubocop:todo Gemfile/MissingFeatureCategory @@ -741,3 +741,5 @@ gem 'openbao_client', path: 'gems/openbao_client' # rubocop:todo Gemfile/Missing gem 'paper_trail', '~> 15.0' # rubocop:todo Gemfile/MissingFeatureCategory gem "i18n_data", "~> 0.13.1", feature_category: :system_access + +gem "gitlab-cloud-connector", "~> 0.2.5", require: 'cloud_connector', feature_category: :cloud_connector diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 6f96ec131e56..fb0f33ad1976 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -97,7 +97,9 @@ PATH PATH remote: gems/gitlab-secret_detection specs: - gitlab-secret_detection (0.1.0) + gitlab-secret_detection (0.1.1) + grpc (= 1.63.0) + grpc-tools (= 1.63.0) parallel (~> 1.22) re2 (~> 2.4) toml-rb (~> 2.2) @@ -227,73 +229,74 @@ GEM CFPropertyList (3.0.5) rexml RedCloth (4.3.4) - acme-client (2.0.18) + acme-client (2.0.19) + base64 (~> 0.2.0) faraday (>= 1.0, < 3.0.0) faraday-retry (>= 1.0, < 3.0.0) - actioncable (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) + actioncable (7.0.8.6) + actionpack (= 7.0.8.6) + activesupport (= 7.0.8.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + actionmailbox (7.0.8.6) + actionpack (= 7.0.8.6) + activejob (= 7.0.8.6) + activerecord (= 7.0.8.6) + activestorage (= 7.0.8.6) + activesupport (= 7.0.8.6) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.4) - actionpack (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activesupport (= 7.0.8.4) + actionmailer (7.0.8.6) + actionpack (= 7.0.8.6) + actionview (= 7.0.8.6) + activejob (= 7.0.8.6) + activesupport (= 7.0.8.6) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8.4) - actionview (= 7.0.8.4) - activesupport (= 7.0.8.4) + actionpack (7.0.8.6) + actionview (= 7.0.8.6) + activesupport (= 7.0.8.6) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.4) - actionpack (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + actiontext (7.0.8.6) + actionpack (= 7.0.8.6) + activerecord (= 7.0.8.6) + activestorage (= 7.0.8.6) + activesupport (= 7.0.8.6) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.4) - activesupport (= 7.0.8.4) + actionview (7.0.8.6) + activesupport (= 7.0.8.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.4) - activesupport (= 7.0.8.4) + activejob (7.0.8.6) + activesupport (= 7.0.8.6) globalid (>= 0.3.6) - activemodel (7.0.8.4) - activesupport (= 7.0.8.4) - activerecord (7.0.8.4) - activemodel (= 7.0.8.4) - activesupport (= 7.0.8.4) + activemodel (7.0.8.6) + activesupport (= 7.0.8.6) + activerecord (7.0.8.6) + activemodel (= 7.0.8.6) + activesupport (= 7.0.8.6) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activesupport (= 7.0.8.4) + activestorage (7.0.8.6) + actionpack (= 7.0.8.6) + activejob (= 7.0.8.6) + activerecord (= 7.0.8.6) + activesupport (= 7.0.8.6) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8.4) + activesupport (7.0.8.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -339,7 +342,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.211.0) + aws-sdk-core (3.213.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -347,7 +350,7 @@ GEM aws-sdk-kms (1.76.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.169.0) + aws-sdk-s3 (1.172.0) aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -437,7 +440,7 @@ GEM coercible (1.0.0) descendants_tracker (~> 0.0.1) colored2 (3.1.2) - commonmarker (0.23.10) + commonmarker (0.23.11) concurrent-ruby (1.2.3) connection_pool (2.4.1) console (1.25.2) @@ -464,6 +467,7 @@ GEM addressable cssbundling-rails (1.4.1) railties (>= 6.0.0) + csv (3.3.0) cvss-suite (3.0.1) danger (9.4.2) claide (~> 1.0) @@ -532,12 +536,12 @@ GEM docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.7.1) + doorkeeper (5.8.1) railties (>= 5) doorkeeper-device_authorization_grant (1.0.3) doorkeeper (~> 5.5) - doorkeeper-openid_connect (1.8.9) - doorkeeper (>= 5.5, < 5.8) + doorkeeper-openid_connect (1.8.10) + doorkeeper (>= 5.5, < 5.9) jwt (>= 2.5) dotenv (2.7.6) dry-cli (1.0.0) @@ -599,7 +603,7 @@ GEM factory_bot_rails (6.4.4) factory_bot (~> 6.5) railties (>= 5.0.0) - faraday (2.12.1) + faraday (2.12.2) faraday-net_http (>= 2.0, < 3.5) json logger @@ -684,8 +688,8 @@ GEM nokogiri (>= 1.5.11, < 2.0.0) formatador (0.2.5) forwardable (1.3.3) - fugit (1.8.1) - et-orbi (~> 1, >= 1.2.7) + fugit (1.11.1) + et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) fuubar (2.2.0) rspec-core (~> 3.0) @@ -723,6 +727,9 @@ GEM terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) + gitlab-cloud-connector (0.2.6) + activesupport (~> 7.0) + jwt (~> 2.9.3) gitlab-dangerfiles (4.8.0) danger (>= 9.3.0) danger-gitlab (>= 8.0.0) @@ -730,7 +737,7 @@ GEM gitlab-experiment (0.9.1) activesupport (>= 3.0) request_store (>= 1.0) - gitlab-fog-azure-rm (2.1.0) + gitlab-fog-azure-rm (2.2.0) faraday (~> 2.0) faraday-follow_redirects (~> 0.3.0) faraday-net_http_persistent (~> 2.0) @@ -739,19 +746,19 @@ GEM mime-types net-http-persistent (~> 4.0) nokogiri (~> 1, >= 1.10.8) - gitlab-glfm-markdown (0.0.21) + gitlab-glfm-markdown (0.0.23) rb_sys (= 0.9.94) - gitlab-kas-grpc (17.5.1) + gitlab-kas-grpc (17.6.2) grpc (~> 1.0) - gitlab-labkit (0.36.1) - actionpack (>= 5.0.0, < 8.0.0) - activesupport (>= 5.0.0, < 8.0.0) + gitlab-labkit (0.37.0) + actionpack (>= 5.0.0, < 8.1.0) + activesupport (>= 5.0.0, < 8.1.0) grpc (>= 1.62) jaeger-client (~> 1.1.0) opentracing (~> 0.4) - pg_query (>= 4.2.3, < 6.0) + pg_query (>= 5.1.0, < 7.0) redis (> 3.0.0, < 6.0.0) - gitlab-license (2.5.0) + gitlab-license (2.6.0) gitlab-mail_room (0.0.25) jwt (>= 2.0) net-imap (>= 0.2.1) @@ -767,8 +774,8 @@ GEM gitlab-security_report_schemas (0.1.2.min15.0.0.max15.2.1) activesupport (>= 6, < 8) json_schemer (~> 2.3.0) - gitlab-styles (13.0.1) - rubocop (~> 1.67.0) + gitlab-styles (13.0.2) + rubocop (~> 1.68.0) rubocop-capybara (~> 2.21.0) rubocop-factory_bot (~> 2.26.1) rubocop-graphql (~> 1.5.4) @@ -783,7 +790,7 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (2.1.0) + gitlab_quality-test_tooling (2.4.0) activesupport (>= 7.0, < 7.2) amatch (~> 0.4.1) fog-google (~> 1.24, >= 1.24.1) @@ -921,7 +928,7 @@ GEM faraday (~> 2.0) graphql-client graphlyte (1.0.0) - graphql (2.4.1) + graphql (2.4.8) base64 fiber-storage graphql-client (0.23.0) @@ -942,6 +949,7 @@ GEM google-protobuf (~> 3.18) googleapis-common-protos (~> 1.4) grpc (~> 1.41) + grpc-tools (1.63.0) gssapi (1.3.1) ffi (>= 1.0.1) guard (2.16.2) @@ -1007,7 +1015,8 @@ GEM ice_nine (0.11.2) imagen (0.1.8) parser (>= 2.5, != 2.5.1.1) - influxdb-client (3.1.0) + influxdb-client (3.2.0) + csv invisible_captcha (2.1.0) rails (>= 5.2) io-event (1.6.5) @@ -1040,9 +1049,9 @@ GEM hana (~> 1.3) regexp_parser (~> 2.0) simpleidn (~> 0.2) - jsonb_accessor (1.3.10) - activerecord (>= 5.0) - activesupport (>= 5.0) + jsonb_accessor (1.4) + activerecord (>= 6.1) + activesupport (>= 6.1) pg (>= 0.18.1) jsonpath (1.1.2) multi_json @@ -1153,7 +1162,7 @@ GEM mixlib-log (3.0.9) mixlib-shellout (3.2.7) chef-utils - mize (0.6.0) + mize (0.6.1) msgpack (1.5.4) multi_json (1.14.1) multi_xml (0.6.0) @@ -1188,7 +1197,7 @@ GEM netrc (0.11.0) nio4r (2.7.0) no_proxy_fix (0.1.2) - nokogiri (1.16.7) + nokogiri (1.16.8) mini_portile2 (~> 2.8.2) racc (~> 1.4) notiffany (0.1.3) @@ -1291,7 +1300,7 @@ GEM opentelemetry-api (~> 1.0) opentelemetry-instrumentation-active_support (~> 0.1) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-action_pack (0.9.0) + opentelemetry-instrumentation-action_pack (0.10.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rack (~> 0.21) @@ -1302,7 +1311,7 @@ GEM opentelemetry-instrumentation-active_job (0.7.8) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_record (0.8.0) + opentelemetry-instrumentation-active_record (0.8.1) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-active_support (0.6.0) @@ -1349,10 +1358,10 @@ GEM opentelemetry-instrumentation-rack (0.25.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rails (0.32.0) + opentelemetry-instrumentation-rails (0.33.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-action_mailer (~> 0.2.0) - opentelemetry-instrumentation-action_pack (~> 0.9.0) + opentelemetry-instrumentation-action_pack (~> 0.10.0) opentelemetry-instrumentation-action_view (~> 0.7.0) opentelemetry-instrumentation-active_job (~> 0.7.0) opentelemetry-instrumentation-active_record (~> 0.8.0) @@ -1415,9 +1424,9 @@ GEM tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.5.6) - pg_query (5.1.0) - google-protobuf (>= 3.22.3) + pg (1.5.9) + pg_query (6.0.0) + google-protobuf (>= 3.25.3) plist (3.7.0) png_quantizator (0.2.1) premailer (1.23.0) @@ -1431,7 +1440,7 @@ GEM prime (0.1.2) forwardable singleton - prism (1.1.0) + prism (1.2.0) proc_to_ast (0.1.0) coderay parser @@ -1452,7 +1461,7 @@ GEM tty-markdown tty-prompt public_suffix (6.0.1) - puma (6.4.3) + puma (6.5.0) nio4r (~> 2.0) pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) @@ -1480,20 +1489,20 @@ GEM rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.7.0) - rails (7.0.8.4) - actioncable (= 7.0.8.4) - actionmailbox (= 7.0.8.4) - actionmailer (= 7.0.8.4) - actionpack (= 7.0.8.4) - actiontext (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activemodel (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + rails (7.0.8.6) + actioncable (= 7.0.8.6) + actionmailbox (= 7.0.8.6) + actionmailer (= 7.0.8.6) + actionpack (= 7.0.8.6) + actiontext (= 7.0.8.6) + actionview (= 7.0.8.6) + activejob (= 7.0.8.6) + activemodel (= 7.0.8.6) + activerecord (= 7.0.8.6) + activestorage (= 7.0.8.6) + activesupport (= 7.0.8.6) bundler (>= 1.15.0) - railties (= 7.0.8.4) + railties (= 7.0.8.6) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -1501,15 +1510,15 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) + rails-html-sanitizer (1.6.1) loofah (~> 2.21) - nokogiri (~> 1.14) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) rails-i18n (7.0.10) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) + railties (7.0.8.6) + actionpack (= 7.0.8.6) + activesupport (= 7.0.8.6) method_source rake (>= 12.2) thor (~> 1.0) @@ -1520,7 +1529,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rb_sys (0.9.94) - rbs (3.5.1) + rbs (3.6.1) logger rbtrace (0.5.1) ffi (>= 1.0.6) @@ -1535,8 +1544,8 @@ GEM redcarpet (3.6.0) redis (5.3.0) redis-client (>= 0.22.0) - redis-actionpack (5.4.0) - actionpack (>= 5, < 8) + redis-actionpack (5.5.0) + actionpack (>= 5) redis-rack (>= 2.1.0, < 4) redis-store (>= 1.1.0, < 2) redis-client (0.22.2) @@ -1625,7 +1634,7 @@ GEM activerecord get_process_mem rails - rubocop (1.67.0) + rubocop (1.68.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -1659,15 +1668,15 @@ GEM ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-lsp (0.19.1) + ruby-lsp (0.21.3) language_server-protocol (~> 3.17.0) - prism (>= 1.1, < 2.0) + prism (>= 1.2, < 2.0) rbs (>= 3, < 4) sorbet-runtime (>= 0.5.10782) - ruby-lsp-rails (0.3.17) - ruby-lsp (>= 0.19.0, < 0.20.0) - ruby-lsp-rspec (0.1.15) - ruby-lsp (~> 0.19.0) + ruby-lsp-rails (0.3.26) + ruby-lsp (>= 0.21.2, < 0.22.0) + ruby-lsp-rspec (0.1.18) + ruby-lsp (~> 0.21.0) ruby-magic (0.6.0) mini_portile2 (~> 2.8) ruby-openai (3.7.0) @@ -1698,7 +1707,7 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (4.25.0) + selenium-webdriver (4.27.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) @@ -1766,7 +1775,7 @@ GEM thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) - sorbet-runtime (0.5.11266) + sorbet-runtime (0.5.11647) spamcheck (1.3.0) grpc (~> 1.0) spring (4.1.0) @@ -1818,7 +1827,7 @@ GEM unicode-display_width (>= 1.1.1, < 3) terser (1.0.2) execjs (>= 0.3.0, < 3) - test-prof (1.4.0) + test-prof (1.4.2) test_file_finder (0.3.1) faraday (>= 1.0, < 3.0, != 2.0.0) text (1.3.1) @@ -1881,9 +1890,7 @@ GEM unf_ext unf_ext (0.0.8.2) unicode-display_width (2.4.2) - unicode-emoji (4.0.0) - unicode-version (~> 1.0) - unicode-version (1.4.0) + unicode-emoji (4.0.4) unicode_utils (1.4.0) uniform_notifier (1.16.0) unleash (3.2.2) @@ -1939,7 +1946,7 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.8.1) + webrick (1.8.2) websocket (1.2.10) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) @@ -1965,7 +1972,7 @@ PLATFORMS DEPENDENCIES CFPropertyList (~> 3.0.0) RedCloth (~> 4.3.3) - acme-client (~> 2.0.18) + acme-client (~> 2.0.19) activerecord-explain-analyze (~> 0.1) activerecord-gitlab! addressable (~> 2.8) @@ -1982,8 +1989,8 @@ DEPENDENCIES attr_encrypted (~> 3.2.4)! awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.211.0) - aws-sdk-s3 (~> 1.169.0) + aws-sdk-core (~> 3.213.0) + aws-sdk-s3 (~> 1.172.0) axe-core-rspec (~> 4.9.0) babosa (~> 2.0) base32 (~> 0.3.0) @@ -2027,9 +2034,9 @@ DEPENDENCIES diff_match_patch (~> 0.1.0)! diffy (~> 3.4) discordrb-webhooks (~> 3.5) - doorkeeper (~> 5.6, >= 5.6.6) + doorkeeper (~> 5.8, >= 5.8.1) doorkeeper-device_authorization_grant (~> 1.0.0) - doorkeeper-openid_connect (~> 1.8, >= 1.8.7) + doorkeeper-openid_connect (~> 1.8.10) duo_api (~> 1.3) ed25519 (~> 1.3.0) elasticsearch-api (= 7.17.11) @@ -2055,7 +2062,7 @@ DEPENDENCIES fog-core (= 2.1.0) fog-google (~> 1.24.1) fog-local (~> 0.8) - fugit (~> 1.8.1) + fugit (~> 1.11.1) fuubar (~> 2.2.0) gdk-toogle (~> 0.9, >= 0.9.5) gettext (~> 3.4, >= 3.4.9) @@ -2063,16 +2070,17 @@ DEPENDENCIES gitaly (~> 17.5.0.pre.rc1) gitlab-backup-cli! gitlab-chronic (~> 0.10.5) + gitlab-cloud-connector (~> 0.2.5) gitlab-dangerfiles (~> 4.8.0) gitlab-duo-workflow-service-client (~> 0.1)! gitlab-experiment (~> 0.9.1) - gitlab-fog-azure-rm (~> 2.1.0) + gitlab-fog-azure-rm (~> 2.2.0) gitlab-glfm-markdown (~> 0.0.21) gitlab-housekeeper! gitlab-http! - gitlab-kas-grpc (~> 17.5.0) - gitlab-labkit (~> 0.36.0) - gitlab-license (~> 2.5) + gitlab-kas-grpc (~> 17.6.1) + gitlab-labkit (~> 0.37.0) + gitlab-license (~> 2.6) gitlab-mail_room (~> 0.0.24) gitlab-markup (~> 1.9.0) gitlab-net-dns (~> 0.9.2) @@ -2084,12 +2092,12 @@ DEPENDENCIES gitlab-secret_detection! gitlab-security_report_schemas (= 0.1.2.min15.0.0.max15.2.1) gitlab-sidekiq-fetcher! - gitlab-styles (~> 13.0.1) + gitlab-styles (~> 13.0.2) gitlab-topology-service-client (~> 0.1)! gitlab-utils! gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 2.1.0) + gitlab_quality-test_tooling (~> 2.4.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -2139,7 +2147,7 @@ DEPENDENCIES js_regex (~> 3.8) json (~> 2.7.2) json_schemer (~> 2.3.0) - jsonb_accessor (~> 1.3.10) + jsonb_accessor (~> 1.4) jwt (~> 2.9.3) kaminari (~> 1.2.2) knapsack (~> 4.0.0) @@ -2224,21 +2232,21 @@ DEPENDENCIES parslet (~> 1.8) peek (~> 1.1) pg (~> 1.5.6) - pg_query (~> 5.1.0) + pg_query (~> 6.0.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.12.0) prometheus-client-mmap (= 1.1.2) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.6.4) - puma (= 6.4.3) + puma (= 6.5.0) rack (~> 2.2.9) rack-attack (~> 6.7.0) rack-cors (~> 2.0.1) rack-oauth2 (~> 2.2.1) rack-proxy (~> 0.7.7) rack-timeout (~> 0.7.0) - rails (~> 7.0.8.4) + rails (~> 7.0.8.6) rails-controller-testing rails-i18n (~> 7.0, >= 7.0.9) rainbow (~> 3.0) @@ -2246,7 +2254,7 @@ DEPENDENCIES re2 (= 2.7.0) recaptcha (~> 5.12) redis (~> 5.3.0) - redis-actionpack (~> 5.4.0) + redis-actionpack (~> 5.5.0) redis-clustering (~> 5.3.0) redis-namespace (~> 1.11.0) request_store (~> 1.5.1) @@ -2263,7 +2271,7 @@ DEPENDENCIES rspec_profiling (~> 0.0.9) rubocop ruby-fogbugz (~> 0.3.0) - ruby-lsp (~> 0.19.0) + ruby-lsp (~> 0.21.0) ruby-lsp-rails (~> 0.3.6) ruby-lsp-rspec (~> 0.1.10) ruby-magic (~> 0.6) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index e4d9e1eac00e..77f8691bf9b8 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -1,15 +1,15 @@ src: { acme-client = { - dependencies = ["faraday" "faraday-retry"]; + dependencies = ["base64" "faraday" "faraday-retry"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xgj5r8b7q242f3p9rr17v0q10dd9nx53gmscpmidz3gj90v7siz"; + sha256 = "1y246a1wimhjbzsmgjnai1jwmp151afkygamrw1rac6y9jq7lr19"; type = "gem"; }; - version = "2.0.18"; + version = "2.0.19"; }; actioncable = { dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"]; @@ -17,10 +17,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c46q4ykf8cqcpzad7zhkrxjhvf92sil0185zvxwzhj95p1zp5vr"; + sha256 = "0ms0196bp8gzlghfj32q2qdzszb7hsgg96v3isrv5ysd87w0z2zl"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.0.8.6"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -28,10 +28,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x100vq4rf2c5ndz8ai00hb5gsb9ax2xqc89dsfzzhxbpa9gs9ik"; + sha256 = "0mw8casnlqgj3vwqv7qk3d4q3bjszlpmbs9ldpc9gz1qdvafx7cg"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.0.8.6"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -39,10 +39,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hds7b6n7vsa64fmma7wl7x9mxscr89myfb13vxni5fcns1agwzr"; + sha256 = "07gpm15k5c0y84q99zipnhcdgq93bwralyjpj252prvqwfjmiw73"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.0.8.6"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -50,10 +50,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18k05a55i0xgyv60lx0m1psnyncn935j76ivbp9hssqpij00jj1f"; + sha256 = "19ywl4jp77b51c01hsyzwia093fnj73pw1ipgyj4pk3h2b9faj5n"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.0.8.6"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -61,10 +61,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g54g1kjyrwv9g592gxfz7z6ksmj916l1cgkxk54zhywxf6gpn0y"; + sha256 = "1j8b29764nbiqz6d7ra42j2i6wf070lbms1fhpq3cl9azbgijb16"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.0.8.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -72,10 +72,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03rfynhj40270dqhkm4cyaphzb37b4fdiaqh9grvcfq760vx7ha5"; + sha256 = "0girx71db1aq5b70ln3qq03z9d7xjdyp297v1a8rdal7k89y859c"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.0.8.6"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -83,10 +83,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b54didwsg5p8wn30qjwspzh97w7g07hrsdzr7wdrdly4zii7sr1"; + sha256 = "0gbc0wx9xal5bj0pbz8ygkr75wj4cm5i69hpwknf023psgixaybw"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.0.8.6"; }; activemodel = { dependencies = ["activesupport"]; @@ -94,10 +94,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mi5cppdmkzgr2z135ibs0bq71qndbnip0vfflz1n4j4hqnhjkpg"; + sha256 = "1f6szahjsb4pr2xvlvk4kghk9291xh9c14s8cqwy6wwpm1vcglim"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.0.8.6"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -105,10 +105,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pkv0jvvjc3grr0rvxni9b3j3hb22jaj0h70g476h9w54p0aljcb"; + sha256 = "14qs1jc9hwnsm4dzvnai8b36bcq1d7rcqgjxy0dc6wza670lqapf"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.0.8.6"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -137,10 +137,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qdqx20dqkg7iwzb8q5148x5sl9mr2063hxzy4i7i94af2d2vz6b"; + sha256 = "1nnvqnmc7mdhw2w55j4vnx4zmmdmmwmaf6ax2mbj9j5a48fw19vf"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.0.8.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -148,10 +148,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15z11983ws5svibg6rky9k2mgd4d4chnvddyxfpgn81b81q70139"; + sha256 = "0gj20cysajda05z3r7pl1g9y84nzsqak5dvk9nrz13jpy6297dj1"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.0.8.6"; }; addressable = { dependencies = ["public_suffix"]; @@ -400,10 +400,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16mvscjhxdyhlvk2rpbxdzqmyikcf64xavb35grk4dkh0pg390rk"; + sha256 = "06fvh863v0g7h14642yxy0plfnp4jg1g7pdazmv1gmkj3nz8b9kc"; type = "gem"; }; - version = "3.211.0"; + version = "3.213.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -422,10 +422,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jnf9k9d91ki3yvy12q4kph5wvd8l3ziwwh0qsmar5xhyb7zbwrz"; + sha256 = "0hwj46w4ilynw5rilpydbykk7hp2hfg2rmwlnr0b4wy5f3aq7b52"; type = "gem"; }; - version = "1.169.0"; + version = "1.172.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -918,10 +918,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lb5slzbqrca49h0gaifg82xky5r7i9xgm4560pin1xl5fp15lzx"; + sha256 = "1gyjwd7in1nlf8zai2fxazxi8cy6xjzswdcjway520blb39ka7cx"; type = "gem"; }; - version = "0.23.10"; + version = "0.23.11"; }; concurrent-ruby = { groups = ["default" "development" "monorepo" "test"]; @@ -1062,6 +1062,16 @@ src: }; version = "1.4.1"; }; + csv = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zfn40dvgjk1xv1z8l11hr9jfg3jncwsc9yhzsz4l4rivkpivg8b"; + type = "gem"; + }; + version = "3.3.0"; + }; csv_builder = { groups = ["default"]; platforms = []; @@ -1358,10 +1368,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a6nbc12nfz355am2vwm1ql2p8zck7mr941glghmnl32djaga24b"; + sha256 = "0v6jjb1259y8dq97ibchc20jqjgk3z7zn12ggv5wzn2mcz1z6m3d"; type = "gem"; }; - version = "5.7.1"; + version = "5.8.1"; }; doorkeeper-device_authorization_grant = { dependencies = ["doorkeeper"]; @@ -1380,10 +1390,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bpw7flhhkfffbfpxrpc46hw1jrvmyafn8npqzhlds8ks68sj2ap"; + sha256 = "0hip8n52fbrnv0pagx4ndap51j9wyrz5m0pw9v59mgicnnlzm3mj"; type = "gem"; }; - version = "1.8.9"; + version = "1.8.10"; }; dotenv = { groups = ["default"]; @@ -1716,10 +1726,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vxaw0mg8avqivdj0lzj19nxf652ri208grsdf0361flyn5i5wi3"; + sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm"; type = "gem"; }; - version = "2.12.1"; + version = "2.12.2"; }; faraday-follow_redirects = { dependencies = ["faraday"]; @@ -2048,10 +2058,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cm2lrvhrpqq19hbdsxf4lq2nkb2qdldbdxh3gvi15l62dlb5zqq"; + sha256 = "0s4qhq3mjl0gak5wl20w9d5jhq069mk1393dkj76s8i2pvkqb578"; type = "gem"; }; - version = "1.8.1"; + version = "1.11.1"; }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; @@ -2193,6 +2203,17 @@ src: }; version = "0.10.5"; }; + gitlab-cloud-connector = { + dependencies = ["activesupport" "jwt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c042q0fcqmavs9ncnhiyzwf06xwv7i1jj43lydq07s68jm49sbf"; + type = "gem"; + }; + version = "0.2.6"; + }; gitlab-dangerfiles = { dependencies = ["danger" "danger-gitlab" "rake"]; groups = ["danger" "development" "test"]; @@ -2231,10 +2252,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p8bmbkfc0dkq663vxm9nx7kaajnqa5in1mcz0c8z31a86gcvgpm"; + sha256 = "1acbwzi4dkixfmb2rggzf4pg65cyxhbggrs4642p8y7mf0hpraii"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; gitlab-glfm-markdown = { dependencies = ["rb_sys"]; @@ -2242,10 +2263,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h1vsqblhy9bqw01nsyylmhz0b50n17r7p69c2s757ahpk0hm5nb"; + sha256 = "097zykj89jqbp9gl62132bwv8qcxp3vr8w8bvdm35slsqc4jk8c9"; type = "gem"; }; - version = "0.0.21"; + version = "0.0.23"; }; gitlab-housekeeper = { dependencies = ["activesupport" "awesome_print" "httparty" "rubocop"]; @@ -2273,10 +2294,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19qwlv3kjszypx8in77llqanlsgdcb16wsgzzfkph79hm7x9nqw8"; + sha256 = "11v8jy5dv5vknrgzpasbdncy6jxpxsnrbbz9kpaxpky2k9n7s1fg"; type = "gem"; }; - version = "17.5.1"; + version = "17.6.2"; }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; @@ -2284,20 +2305,20 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0063h3aksh4jp5s7mrir5r2dr94643x736cgxvf1zz75nx0nkyq4"; + sha256 = "0w7szxnvh9hvxcragnqvn37c6jpm4gf7aadzxslajj91vdh0mpfj"; type = "gem"; }; - version = "0.36.1"; + version = "0.37.0"; }; gitlab-license = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k9zaybfzp7q8w07ghf44q3yngxyrr68l623r9v7il9aki36q5jc"; + sha256 = "05nhswkfhxkr5y87gkq17h23a1kkr78c2n7pgg3hwr1m73kql7rc"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; gitlab-mail_room = { dependencies = ["jwt" "net-imap" "oauth2" "redis" "redis-namespace"]; @@ -2382,14 +2403,14 @@ src: version = "0.3.1"; }; gitlab-secret_detection = { - dependencies = ["parallel" "re2" "toml-rb"]; + dependencies = ["grpc" "grpc-tools" "parallel" "re2" "toml-rb"]; groups = ["default"]; platforms = []; source = { path = "${src}/gems/gitlab-secret_detection"; type = "path"; }; - version = "0.1.0"; + version = "0.1.1"; }; gitlab-security_report_schemas = { dependencies = ["activesupport" "json_schemer"]; @@ -2418,10 +2439,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gb89c035f32hj8iam4hxlyx6c7f1apq66hzzrvan5djjzz4065z"; + sha256 = "0qf8rsw6yv4dzaq8kgbrh7wlfr89j5hf5yb1m1aknxj38qrvjqp6"; type = "gem"; }; - version = "13.0.1"; + version = "13.0.2"; }; gitlab-topology-service-client = { dependencies = ["grpc"]; @@ -2471,10 +2492,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z74fj5gklxpq8bc622f6psaaz8fpkg08q4lf28kj9krcx3b0jw3"; + sha256 = "181nzcn5ny8wc4vs737j9fwsmm25yps4kvwwkhdky985id914k1f"; type = "gem"; }; - version = "2.1.0"; + version = "2.4.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2930,10 +2951,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sc2s5yprba7i6x8iskd39fsp93r04xa08wbz1m5bygvj0lb7zpf"; + sha256 = "1dbg7xp1jgcfnmpvv8xcpzxandjkhqpsfybiwipz0sj7br685zzn"; type = "gem"; }; - version = "2.4.1"; + version = "2.4.8"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -2979,6 +3000,16 @@ src: }; version = "1.5.0"; }; + grpc-tools = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h7abfifclwhfipxx6iwc7cr4h3hq69wd992dj2bzg4dds6yhg8k"; + type = "gem"; + }; + version = "1.63.0"; + }; gssapi = { dependencies = ["ffi"]; groups = ["kerberos"]; @@ -3276,14 +3307,15 @@ src: version = "0.1.8"; }; influxdb-client = { + dependencies = ["csv"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j01r3rhai3h0bgq7npi49xz6ahm5sj6zag8b0l3amdxp82wb7ay"; + sha256 = "1wp1p29hg5xb1izrl5xr6azp8x0l9kx9nvdg66glrxj20p48w7nw"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.0"; }; invisible_captcha = { dependencies = ["rails"]; @@ -3427,10 +3459,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q2q9i2kf4p6vw8fbzvsd037wl837gpsiiikjazf6fdfayi803v7"; + sha256 = "1avnyx2ympzbmkqbc9dfy87npzcfia8sys2dc9m6prs3p1y0h3h1"; type = "gem"; }; - version = "1.3.10"; + version = "1.4"; }; jsonpath = { dependencies = ["multi_json"]; @@ -3935,10 +3967,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qr3vf0qc216kyyv2vnp8p9pv73di6zd6v9sx51qw5awrd90y6iz"; + sha256 = "105pjjmncf7q724swbygrbsgmh74ni4s2xaclbyjcm7zg64maca0"; type = "gem"; }; - version = "0.6.0"; + version = "0.6.1"; }; msgpack = { groups = ["default"]; @@ -4186,10 +4218,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq"; + sha256 = "18ajyy4d16q4ahnrfmj6d6z9ak21mnbn4wblx2vddck3lvwlpkny"; type = "gem"; }; - version = "1.16.7"; + version = "1.16.8"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -4550,10 +4582,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16nbkayp8jb2zkqj2rmqd4d1mz4wdf0zg6jx8b0vzkf9mxr89py5"; + sha256 = "00mbrqmpk7p3wy377izsspshzdb849b9dv22z8f2hajcpr2im0id"; type = "gem"; }; - version = "0.9.0"; + version = "0.10.0"; }; opentelemetry-instrumentation-action_view = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"]; @@ -4583,10 +4615,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j61jv60hdvjs18rj7i3lbkd5zqkfm8fdx15c0ixdxc15q88778r"; + sha256 = "14aar8w2szn5fi7j3lg35qlq1r12ka6lvcrcn700agv5nm3han5y"; type = "gem"; }; - version = "0.8.0"; + version = "0.8.1"; }; opentelemetry-instrumentation-active_support = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; @@ -4748,10 +4780,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13nj66l0jhs4pz4krlncyach5zb1bbb82bfipkvc33b0dmicll88"; + sha256 = "0v9021ixcfs9shwf2c130gd0xxpwz8p1d5r7bci15mmrzq7wj37h"; type = "gem"; }; - version = "0.32.0"; + version = "0.33.0"; }; opentelemetry-instrumentation-rake = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; @@ -4972,10 +5004,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "071b55bhsz7mivlnp2kv0a11msnl7xg5awvk8mlflpl270javhsb"; + sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn"; type = "gem"; }; - version = "1.5.6"; + version = "1.5.9"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -4983,10 +5015,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p8ljf694qvrf5875ljg6kp7gvmndy8490kasjzcq22ghryg9xxp"; + sha256 = "012w1ypcbzy6w4dsxiziqn1vqddwzpza3zdvw9hivvhcj179mw7v"; type = "gem"; }; - version = "5.1.0"; + version = "6.0.0"; }; plist = { groups = ["default"]; @@ -5046,10 +5078,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ywvpskabdm0ckg6b3cf1jczg1jkjnb1mr0g73cy5l09xdlx5w25"; + sha256 = "0bvdq2jsn1jj8vgp9xrmi6ljw0hqlv4i97v5aa0fcii34g9rrzr4"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -5133,10 +5165,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914"; + sha256 = "1wl9q4fl8gvhwdpfxghx6jdqi4508287pcgiwi96sdbzmdfbglcl"; type = "gem"; }; - version = "6.4.3"; + version = "6.5.0"; }; pyu-ruby-sasl = { groups = ["default"]; @@ -5282,10 +5314,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sv5jzd3varqzcqm8zxllwiqzgbgcymszw12ci3f9zbzlliq8hby"; + sha256 = "1s42lyl19h74xlqkb6ffl67h688q0slp1lhnd05g09a46z7wapri"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.0.8.6"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -5315,10 +5347,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pm4z853nyz1bhhqr7fzl44alnx4bjachcr6rh6qjj375sfz3sc6"; + sha256 = "1w6bqm8d3afc66ff6npnsc2d8ky552n6qzwwwc1bh0wz6c8gplp3"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; rails-i18n = { dependencies = ["i18n" "railties"]; @@ -5337,10 +5369,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02z7lqx0y60bzpkd4v67i9sbdh7djs0mm89h343kidx0gmq0kbh0"; + sha256 = "1fcn0ix814074gqicc0k1178f7ahmysiv3pfq8g00phdwj0p3w0g"; type = "gem"; }; - version = "7.0.8.4"; + version = "7.0.8.6"; }; rainbow = { groups = ["coverage" "default" "development" "test"]; @@ -5399,10 +5431,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bnb361ca6gizncs8qybfrm1m9pin2siw548pizfd5l711mrzn4f"; + sha256 = "1h1jal1sv47saxyk33nnjk2ywrsf35aar18p7mc48s2m33876wpd"; type = "gem"; }; - version = "3.5.1"; + version = "3.6.1"; }; rbtrace = { dependencies = ["ffi" "msgpack" "optimist"]; @@ -5494,10 +5526,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h1mx8shrzpcj27k9kw77f4cq7i217vxfd1ksqb4g485md4zc37i"; + sha256 = "049kd6480j16d3xmnsayqmmrircffympzf8pbjrn5v0lijvp01fw"; type = "gem"; }; - version = "5.4.0"; + version = "5.5.0"; }; redis-client = { dependencies = ["connection_pool"]; @@ -5859,10 +5891,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "131pbjl7bv9g9qli84j91kgqmcqzdm2flq7r9abskl3ndqiagk4c"; + sha256 = "0ay1lrz3ffrznjfr65c6xvkinb6m4l7h68cd9qbrf7nq0j2m1pq7"; type = "gem"; }; - version = "1.67.0"; + version = "1.68.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -5969,10 +6001,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vcc2jib05p8lf09mczxyd2rw89gybbk8lkc08ckzq53lqvzj4yh"; + sha256 = "1hayvpcmgjylxpgxs05jdzyahar4cxpgwhg2b6gg1qhcfhky7i2i"; type = "gem"; }; - version = "0.19.1"; + version = "0.21.3"; }; ruby-lsp-rails = { dependencies = ["ruby-lsp"]; @@ -5980,10 +6012,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l8z5m81519ki6p33s8xxy3vbcvp71did91pzvhr129a7cqhxs14"; + sha256 = "0lb39frvjwm25iw0q7bzbv6hyh2p2p634fsnplkxz9vqgb0r53pm"; type = "gem"; }; - version = "0.3.17"; + version = "0.3.26"; }; ruby-lsp-rspec = { dependencies = ["ruby-lsp"]; @@ -5991,10 +6023,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17dxzzywxy8x78nxm24czdc9jf75ghgqijj396q1mx0nknmd9vni"; + sha256 = "0qf43lkvf6v0c5z173sqbxw9vk1vwjfwaq9ynj658kzba8pqjvjf"; type = "gem"; }; - version = "0.1.15"; + version = "0.1.18"; }; ruby-magic = { dependencies = ["mini_portile2"]; @@ -6180,10 +6212,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1md0sixm8dq8a7riv50x4q1z273q47b5jvcbv5hxympxn3ran4by"; + sha256 = "1q5nbszbxz566yzyiv0a4lvfk56q89k0lk4mqp6wyddrc2nz88c8"; type = "gem"; }; - version = "4.25.0"; + version = "4.27.0"; }; semver_dialects = { dependencies = ["deb_version" "pastel" "thor" "tty-command"]; @@ -6432,10 +6464,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fsq1k58isarg6ycg2ix9sw9a6391y12ss48m3hcryqi902w7cny"; + sha256 = "1dpxyhph8rp0bwiacqjsvsm67gm6v7bw16na20rk59g6y8953dk4"; type = "gem"; }; - version = "0.5.11266"; + version = "0.5.11647"; }; spamcheck = { dependencies = ["grpc"]; @@ -6717,10 +6749,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x0gj68an9nkb8pvlzxs7m5n3ip3fizlw9s4kgkyj5kjqgpw6swn"; + sha256 = "1mydvmcm4m5501322wyl3pwmc6i5ijvwh4kb242l085j88hiqp4n"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.2"; }; test_file_finder = { dependencies = ["faraday"]; @@ -7027,25 +7059,14 @@ src: version = "2.4.2"; }; unicode-emoji = { - dependencies = ["unicode-version"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zis8a993f4hxmcmmacm7rwzd06hpzfs7aa4zqqik39gg8pxz74l"; + sha256 = "0ajk6rngypm3chvl6r0vwv36q1931fjqaqhjjya81rakygvlwb1c"; type = "gem"; }; - version = "4.0.0"; - }; - unicode-version = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qvmcyv9gh5i0x4pzd30jn1j9vn6h67zaiymmklz4b8498srlh2n"; - type = "gem"; - }; - version = "1.4.0"; + version = "4.0.4"; }; unicode_utils = { groups = ["default"]; @@ -7265,10 +7286,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; + sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3"; type = "gem"; }; - version = "1.8.1"; + version = "1.8.2"; }; websocket = { groups = ["default" "test"]; diff --git a/pkgs/by-name/gi/gitaly/git.nix b/pkgs/by-name/gi/gitaly/git.nix index 5277209ef35d..bfeae1c0a0de 100644 --- a/pkgs/by-name/gi/gitaly/git.nix +++ b/pkgs/by-name/gi/gitaly/git.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "gitaly-git"; - version = "2.46.2"; + version = "2.47.0"; # `src` attribute for nix-update src = fetchFromGitLab { owner = "gitlab-org"; repo = "git"; rev = "v${version}"; - hash = "sha256-LQqb3lmYIqtwIHR5KHg/Cm568CxQqeGOBAQeXphqSXo="; + hash = "sha256-KG8YYGVWkfazVm8lOGs+Tg79wDl5O33JLkKrYBSIZYk="; }; # we actually use the gitaly build system diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index 925e5f1b436c..86e6f381558f 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "17.6.2"; + version = "17.7.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -21,10 +21,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-i+Yk5hFhtIxf12crSJRbkHNbfPy9ZbxSNFEPwFOovhE="; + hash = "sha256-XklkFdp2tIZewIxi9XY1HQ1toL590tvY1DQ/VNF/QQo="; }; - vendorHash = "sha256-AxuAEiYV3jwWxcuTLc1i4/6sG957YIA+Fmky5Dkdzu8="; + vendorHash = "sha256-STZvZqqCbW/n3uZohYmz/2lJNkiUUcVjs0msL/lDDaE="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index 72c8b4a9d767..ccda133734b6 100644 --- a/pkgs/by-name/gi/gitlab-pages/package.nix +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.6.2"; + version = "17.7.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-iO6kMggGajB7ARXsJynEVbgd7iPBBp0x6J1lKuOxgH4="; + hash = "sha256-DbrasgqowycZNJ2VWwpMBw9SQCxfV47aDVMJrUOQ/Es="; }; - vendorHash = "sha256-2feUOWcGj7eQ43rfM6IF55BawYVP4UY5sKA29Y9ozPk="; + vendorHash = "sha256-pJj0BaplDwlNiD+Aqkh1dvu8NfxMhuunK1fnM7TQmuw="; subPackages = [ "." ]; meta = with lib; { From 64f7305e3b4c7fd872870d08a2827e63766bac20 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 09:11:00 +0100 Subject: [PATCH 27/81] jwt-cli: remove with lib; --- pkgs/tools/security/jwt-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 9fc3f9c84416..06082f4d8101 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -38,12 +38,12 @@ rustPlatform.buildRustPackage rec { | grep -q 'John Doe' ''; - meta = with lib; { + meta = { description = "Super fast CLI tool to decode and encode JWTs"; homepage = "https://github.com/mike-engel/jwt-cli"; changelog = "https://github.com/mike-engel/jwt-cli/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ rycee ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rycee ]; mainProgram = "jwt"; }; } From 5bbeabe20c92b39d2a7cd1b4104fe5fb75930747 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 09:33:01 +0100 Subject: [PATCH 28/81] jwt-cli: add passthru.updateScript --- pkgs/tools/security/jwt-cli/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 06082f4d8101..1f84fd3dd7be 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + gitUpdater, installShellFiles, rustPlatform, Security, @@ -38,6 +39,8 @@ rustPlatform.buildRustPackage rec { | grep -q 'John Doe' ''; + passthru.updateScript = gitUpdater { }; + meta = { description = "Super fast CLI tool to decode and encode JWTs"; homepage = "https://github.com/mike-engel/jwt-cli"; From 9f752d2c084ce7cac5fbd29dde8999c00709452a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 9 Jan 2025 11:54:45 +0100 Subject: [PATCH 29/81] uutils-coreutils: move to by-name --- .../uu/uutils-coreutils/package.nix} | 13 +++---------- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 3 insertions(+), 15 deletions(-) rename pkgs/{tools/misc/uutils-coreutils/default.nix => by-name/uu/uutils-coreutils/package.nix} (89%) diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix similarity index 89% rename from pkgs/tools/misc/uutils-coreutils/default.nix rename to pkgs/by-name/uu/uutils-coreutils/package.nix index 3c0c6aa8738a..31bfa78779ae 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -4,9 +4,7 @@ fetchFromGitHub, rustPlatform, cargo, - sphinx, - Security, - libiconv, + python3Packages, prefix ? "uutils-", buildMulticallBinary ? true, }: @@ -30,17 +28,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ rustPlatform.cargoSetupHook - sphinx - ]; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - libiconv + python3Packages.sphinx ]; makeFlags = [ - "CARGO=${cargo}/bin/cargo" + "CARGO=${lib.getExe cargo}" "PREFIX=${placeholder "out"}" "PROFILE=release" "INSTALLDIR_MAN=${placeholder "out"}/share/man/man1" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 678148fc1606..574c84ca64e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3170,11 +3170,6 @@ with pkgs; uusi = haskell.lib.compose.justStaticExecutables haskellPackages.uusi; - uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { - inherit (python3Packages) sphinx; - inherit (darwin.apple_sdk.frameworks) Security; - }; - uutils-coreutils-noprefix = uutils-coreutils.override { prefix = null; }; vorta = qt6Packages.callPackage ../applications/backup/vorta { }; From 0f1e7eedbef40957ec627e0acb72da29527cdfc1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 9 Jan 2025 11:56:48 +0100 Subject: [PATCH 30/81] uutils-coreutils: add versionCheckHook --- pkgs/by-name/uu/uutils-coreutils/package.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index 31bfa78779ae..302ea994e8aa 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -5,6 +5,8 @@ rustPlatform, cargo, python3Packages, + versionCheckHook, + prefix ? "uutils-", buildMulticallBinary ? true, }: @@ -44,6 +46,17 @@ stdenv.mkDerivation rec { # too many impure/platform-dependent tests doCheck = false; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = + let + prefix' = lib.optionalString (prefix != null) prefix; + in + "${placeholder "out"}/bin/${prefix'}ls"; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + meta = { description = "Cross-platform Rust rewrite of the GNU coreutils"; longDescription = '' From 6921c8c947e0e908ff66a9c364b2620f4c57127c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 9 Jan 2025 15:04:06 +0100 Subject: [PATCH 31/81] uutils-coreutils: add updateScript --- pkgs/by-name/uu/uutils-coreutils/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index 302ea994e8aa..bc86e8166077 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -6,6 +6,7 @@ cargo, python3Packages, versionCheckHook, + nix-update-script, prefix ? "uutils-", buildMulticallBinary ? true, @@ -57,6 +58,10 @@ stdenv.mkDerivation rec { versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Cross-platform Rust rewrite of the GNU coreutils"; longDescription = '' From cb663ae81ec2fb7e7336cd0cd6f1df73ef18b606 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 9 Jan 2025 15:29:20 +0100 Subject: [PATCH 32/81] ruff: 0.8.6 -> 0.9.0 Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.8.6...0.9.0 Changelog: https://github.com/astral-sh/ruff/releases/tag/0.9.0 --- pkgs/by-name/ru/ruff/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 223f777357c8..b9fd33fc1319 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.8.6"; + version = "0.9.0"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = version; - hash = "sha256-9YvHmNiKdf5hKqy9tToFSQZM2DNLoIiChcfjQay8wbU="; + hash = "sha256-OAhjatPzwvLT3HyXYPzaL5pAC5CH75CyMmFo0c4726I="; }; useFetchCargoVendor = true; - cargoHash = "sha256-aTzTCDCMhG4cKD9wFNHv6A3VBUifnKgI8a6kelc3bAM="; + cargoHash = "sha256-vroKiwouk2E2WYB/B+8zszXqer5pENDYrxcrCQ17mF0="; nativeBuildInputs = [ installShellFiles ]; From 8711bcf71aae881c81a32a30b6992dee4ef74ec4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 9 Jan 2025 15:43:10 +0100 Subject: [PATCH 33/81] nixos-test-driver: reformat with latest ruff --- nixos/lib/test-driver/src/test_driver/__init__.py | 2 +- nixos/lib/test-driver/src/test_driver/machine.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/lib/test-driver/src/test_driver/__init__.py b/nixos/lib/test-driver/src/test_driver/__init__.py index 42b6d29b7671..1c0793aa75a5 100755 --- a/nixos/lib/test-driver/src/test_driver/__init__.py +++ b/nixos/lib/test-driver/src/test_driver/__init__.py @@ -145,7 +145,7 @@ def main() -> None: tic = time.time() driver.run_tests() toc = time.time() - logger.info(f"test script finished in {(toc-tic):.2f}s") + logger.info(f"test script finished in {(toc - tic):.2f}s") def generate_driver_symbols() -> None: diff --git a/nixos/lib/test-driver/src/test_driver/machine.py b/nixos/lib/test-driver/src/test_driver/machine.py index c423ad8a3fc0..b554f7316779 100644 --- a/nixos/lib/test-driver/src/test_driver/machine.py +++ b/nixos/lib/test-driver/src/test_driver/machine.py @@ -702,8 +702,7 @@ class Machine: def get_tty_text(self, tty: str) -> str: status, output = self.execute( - f"fold -w$(stty -F /dev/tty{tty} size | " - f"awk '{{print $2}}') /dev/vcs{tty}" + f"fold -w$(stty -F /dev/tty{tty} size | awk '{{print $2}}') /dev/vcs{tty}" ) return output From a40c69bcd1618b6bbd83d9cf87ac9d2e63993f66 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 9 Jan 2025 15:46:37 +0100 Subject: [PATCH 34/81] python312Packages.ruff-lsp: 0.0.59 -> 0.0.60 Diff: https://github.com/astral-sh/ruff-lsp/compare/refs/tags/v0.0.59...v0.0.60 Changelog: https://github.com/astral-sh/ruff-lsp/releases/tag/v0.0.60 --- pkgs/by-name/ru/ruff-lsp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ru/ruff-lsp/package.nix b/pkgs/by-name/ru/ruff-lsp/package.nix index f6ecf43c84b4..7c65ab4336d8 100644 --- a/pkgs/by-name/ru/ruff-lsp/package.nix +++ b/pkgs/by-name/ru/ruff-lsp/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication rec { pname = "ruff-lsp"; - version = "0.0.59"; + version = "0.0.60"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff-lsp"; tag = "v${version}"; - hash = "sha256-fMw93EmwO0wbIcGMr7csXkMRzgyQJNQzgLDZQqNB8Zc="; + hash = "sha256-Qo2pzDjdlhIpKfldPbL9VsO1AaSc1bW5t1i1Nqu7alA="; }; build-system = with python3Packages; [ hatchling ]; From 05d3e050f96606d3ffdc2636d9cc7d0c94659f9e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 20:11:03 +0100 Subject: [PATCH 35/81] checkov: 3.2.351 -> 3.2.352 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.351...3.2.352 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.352 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 32e6a5d2cc6c..356d59e09bec 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.351"; + version = "3.2.352"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-GrzCdMw77yAZPRu7eIRJAlZKclpZe/lVMLUP4zNjkts="; + hash = "sha256-by1oMAhhN+VbWzv2+OfQRBGQXkUn4EST4OWqyoOhdEQ="; }; patches = [ ./flake8-compat-5.x.patch ]; From 84c59bc1cff503a83f692bdf788caa906affdee4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 11:11:51 +0100 Subject: [PATCH 36/81] python312Packages.mypy-boto3-cloudhsmv2: 1.35.93 -> 1.35.94 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 1b4c5bfd2f1c..9748389247a0 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -238,8 +238,8 @@ rec { "sha256-4EYaL7nEbjypOOtEJwJvqLvXfS1D0zGzGSWY85XVzRQ="; mypy-boto3-cloudhsmv2 = - buildMypyBoto3Package "cloudhsmv2" "1.35.93" - "sha256-zJpDczYBHPPgdJlFOjzS1RnHLDO3CuPid92S1CwjaxY="; + buildMypyBoto3Package "cloudhsmv2" "1.35.94" + "sha256-dmHU4UGGd5qo7hYvOU+SmLswjMLSNFvONudTRYm25fc="; mypy-boto3-cloudsearch = buildMypyBoto3Package "cloudsearch" "1.35.93" From 7f8cebaa4c6bd3ba9778733ff7e2b9ef897c762d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 11:12:17 +0100 Subject: [PATCH 37/81] python312Packages.mypy-boto3-dynamodb: 1.35.93 -> 1.35.94 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 9748389247a0..77e551e177a9 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -434,8 +434,8 @@ rec { "sha256-EZfK4RgPD0RWYqSbOu3IJX7oXN9QG8G46MFwFV09gyk="; mypy-boto3-dynamodb = - buildMypyBoto3Package "dynamodb" "1.35.93" - "sha256-yrTXfvYfk7w6lRnLMlUmizQ75iOHrSLgg1pjPLmxaY0="; + buildMypyBoto3Package "dynamodb" "1.35.94" + "sha256-kSi8nfpXTx9v45keyMM7NGJtJqdnuWGXOpX3YQ2OmME="; mypy-boto3-dynamodbstreams = buildMypyBoto3Package "dynamodbstreams" "1.35.93" From fd385aa8f7c44c25dce7f38755789b0450539032 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 11:12:38 +0100 Subject: [PATCH 38/81] python312Packages.mypy-boto3-imagebuilder: 1.35.93 -> 1.35.94 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 77e551e177a9..ef4ebd4d79f0 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -614,8 +614,8 @@ rec { "sha256-qSuSaVpjEzdjr9vwH74IibWAiiiQRkXqn+wKWWTU+u0="; mypy-boto3-imagebuilder = - buildMypyBoto3Package "imagebuilder" "1.35.93" - "sha256-Viw56d3d1j/V7zijdxziCh/0E8vy1oZwE7+AhP7Vwx4="; + buildMypyBoto3Package "imagebuilder" "1.35.94" + "sha256-Cj3//KC7Au8xn0NHjLH5yGjbpHFQL80EXhuMSHTlIAc="; mypy-boto3-importexport = buildMypyBoto3Package "importexport" "1.35.93" From 21245b84cd17ecbab4b595516f9064f6d3258d04 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 11:13:35 +0100 Subject: [PATCH 39/81] python312Packages.mypy-boto3-rds: 1.35.93 -> 1.35.95 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index ef4ebd4d79f0..9465170cc668 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1086,8 +1086,8 @@ rec { "sha256-VECkUIkz/tUtKaiRTpi+gcNYpkI9DugZDFZ13ZjL558="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.35.93" - "sha256-S+8+by+OVPbcXL0ZC3rf0XEhEp051oItzpVwEQREdcA="; + buildMypyBoto3Package "rds" "1.35.95" + "sha256-rRukdIPIrpdv4S9+EIndBDp2b4uoWP9cRIV9q1RwL9M="; mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.35.93" From 8df77a2ab5b581a6fcb78d0e3266eace4bd3b011 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 11:13:42 +0100 Subject: [PATCH 40/81] python312Packages.mypy-boto3-route53: 1.35.93 -> 1.35.95 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 9465170cc668..648078ac0cfe 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1134,8 +1134,8 @@ rec { "sha256-Bv1Z2cVGXepn2/VjnoLHozMZvfdfniR+pTzv9FAoXV8="; mypy-boto3-route53 = - buildMypyBoto3Package "route53" "1.35.93" - "sha256-eMp0hg8GwRU3XL+0zmUHGrhq35g89h1AyZ5A8C4g/QE="; + buildMypyBoto3Package "route53" "1.35.95" + "sha256-0Aocwq1wvF7NmODu0NV15IoPEscjb441s0NRTVyi5Hs="; mypy-boto3-route53-recovery-cluster = buildMypyBoto3Package "route53-recovery-cluster" "1.35.93" From deda9220af5eda8d8a546c437e8992f5d10b3886 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 11:13:47 +0100 Subject: [PATCH 41/81] python312Packages.mypy-boto3-sagemaker: 1.35.93 -> 1.35.95 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 648078ac0cfe..f38ccd788009 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1174,8 +1174,8 @@ rec { "sha256-nuCuzwEQnTMuI8Wd1an+vT3fsUAgpHqIRyoXV66L4Xs="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.35.93" - "sha256-87BRRU94aOljH1uYC8aXAyfBX62GL/Wb6L6AkQFOlYc="; + buildMypyBoto3Package "sagemaker" "1.35.95" + "sha256-hJfmA6R/to1JQW/VIi71LoJ6gIhXboZFMtxxZnVtX9A="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.35.93" From 172f95edf50e00c876b6cceec38ca9f8e526fd45 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Thu, 9 Jan 2025 22:09:03 +0100 Subject: [PATCH 42/81] floorp: 11.21.0 -> 11.22.0 Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v11.21.0...v11.22.0 Release notes: https://blog.ablaze.one/4659/2025-01-20/ Signed-off-by: Christoph Heiss --- pkgs/applications/networking/browsers/floorp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 6d523e850979..90ee49000ba6 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -9,7 +9,7 @@ ( (buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.21.0"; + packageVersion = "11.22.0"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -17,14 +17,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "128.5.0"; + version = "128.7.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-gb190h7BAt0biE/RQayyzwSFCDEMe4F8YT6Re2mK9r4="; + hash = "sha256-gPFWSCACWUk7QE85I6alT6hsjMengjiiSE4J9px0Z58="; }; extraConfigureFlags = [ From fdd340a071fbb4c10010fb2f8a15467700de2c31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Jan 2025 21:54:53 +0000 Subject: [PATCH 43/81] tideways-daemon: 1.9.28 -> 1.9.30 --- pkgs/by-name/ti/tideways-daemon/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix index c702991c0854..6c0c16dcf11e 100644 --- a/pkgs/by-name/ti/tideways-daemon/package.nix +++ b/pkgs/by-name/ti/tideways-daemon/package.nix @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-daemon"; - version = "1.9.28"; + version = "1.9.30"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-Te2FGyUjFEZ6hex2n6W+tsOYuehOAmWyzwDzCj3YqVo="; + hash = "sha256-pXWGoDnNQPlDQMriUbjD8+Tiv7jGeBf+5NGPMOAfuIo="; }; "aarch64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz"; - hash = "sha256-tDVo/FkXSamwlQa1Zq5EFmawrdPmCGdSPT6zYWFzCU0="; + hash = "sha256-x9QDaGz7nHEbe3o9awqyBu+0/ArM1QIr9jQ4kcSSnHA="; }; "aarch64-darwin" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-TwbGXr35KYLb+K83Q29mxG0QJGgQxRlkSNLCVbijQyE="; + hash = "sha256-c5ntOhaJaRjipNd0B9ybzPD7EFkdQgEOSaS3JWGfBpA="; }; }; updateScript = "${ From 9f456058b0dc001e1a49137eb6f47c87e09a5362 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 9 Jan 2025 18:56:24 -0600 Subject: [PATCH 44/81] vimPlugins: nativeCheckInputs -> checkInputs --- .../editors/vim/plugins/overrides.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f2ae2f39bdae..73f16825df5b 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -156,10 +156,10 @@ in ]; }; - astroui = super.astroui.overrideAttrs (oa: { + astroui = super.astroui.overrideAttrs { # Readme states that astrocore is an optional dependency - nativeCheckInputs = oa.nativeCheckInputs ++ [ self.astrocore ]; - }); + checkInputs = [ self.astrocore ]; + }; asyncrun-vim = super.asyncrun-vim.overrideAttrs { nvimSkipModule = [ @@ -1055,9 +1055,9 @@ in nvimRequireCheck = "fuzzy_nvim"; }; - fugit2-nvim = super.fugit2-nvim.overrideAttrs (oa: { + fugit2-nvim = super.fugit2-nvim.overrideAttrs { # Requires web-devicons but mini.icons can mock them up - nativeCheckInputs = oa.nativeCheckInputs ++ [ + checkInputs = [ self.nvim-web-devicons ]; dependencies = with self; [ @@ -1071,7 +1071,7 @@ in 'M.library_path = "libgit2"' \ 'M.library_path = "${lib.getLib libgit2}/lib/libgit2${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; - }); + }; fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs { # The plugin has a makefile which tries to run tests in a docker container. @@ -1416,10 +1416,10 @@ in dependencies = [ self.vim-floaterm ]; }; - lightline-bufferline = super.lightline-bufferline.overrideAttrs (oa: { + lightline-bufferline = super.lightline-bufferline.overrideAttrs { # Requires web-devicons but mini.icons can mock them up - nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-web-devicons ]; - }); + checkInputs = [ self.nvim-web-devicons ]; + }; lir-nvim = super.lir-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; @@ -2202,10 +2202,10 @@ in ]; }; - nvim-nonicons = super.nvim-nonicons.overrideAttrs (oa: { + nvim-nonicons = super.nvim-nonicons.overrideAttrs { # Requires web-devicons but mini.icons can mock them up - nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-web-devicons ]; - }); + checkInputs = [ self.nvim-web-devicons ]; + }; nvim-nu = super.nvim-nu.overrideAttrs { dependencies = with self; [ From aae679589d550ad22eed2b4fc2430d4375ec8c15 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Thu, 9 Jan 2025 17:47:41 -0500 Subject: [PATCH 45/81] firefoxpwa: 2.13.1 -> 2.13.2 https://github.com/filips123/PWAsForFirefox/releases/tag/v2.13.2 --- pkgs/by-name/fi/firefoxpwa/Cargo.lock | 3595 ------------------------ pkgs/by-name/fi/firefoxpwa/package.nix | 13 +- 2 files changed, 4 insertions(+), 3604 deletions(-) delete mode 100644 pkgs/by-name/fi/firefoxpwa/Cargo.lock diff --git a/pkgs/by-name/fi/firefoxpwa/Cargo.lock b/pkgs/by-name/fi/firefoxpwa/Cargo.lock deleted file mode 100644 index 75237c9706b1..000000000000 --- a/pkgs/by-name/fi/firefoxpwa/Cargo.lock +++ /dev/null @@ -1,3595 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ab_glyph" -version = "0.2.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", -] - -[[package]] -name = "ab_glyph_rasterizer" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "aligned-vec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anstream" -version = "0.6.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" - -[[package]] -name = "anstyle-parse" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8" - -[[package]] -name = "arbitrary" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" - -[[package]] -name = "arg_enum_proc_macro" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "arrayref" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" - -[[package]] -name = "arrayvec" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" - -[[package]] -name = "async-compression" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" -dependencies = [ - "brotli", - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", - "zstd", - "zstd-safe", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "av1-grain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" -dependencies = [ - "anyhow", - "arrayvec", - "log", - "nom", - "num-rational", - "v_frame", -] - -[[package]] -name = "avif-serialize" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide 0.7.4", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" - -[[package]] -name = "bitstream-io" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" - -[[package]] -name = "blake3" -version = "1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", -] - -[[package]] -name = "brotli" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "built" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "bytemuck" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "byteorder-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" - -[[package]] -name = "bytes" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" - -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "cc" -version = "1.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" -dependencies = [ - "jobserver", - "libc", - "shlex", -] - -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "serde", - "windows-targets 0.52.6", -] - -[[package]] -name = "clap" -version = "4.5.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_complete" -version = "4.5.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "205d5ef6d485fa47606b98b0ddc4ead26eb850aaa86abfb562a94fb3280ecba0" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_derive" -version = "4.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "colorchoice" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" - -[[package]] -name = "configparser" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e57e3272f0190c3f1584272d613719ba5fc7df7f4942fe542e63d949cf3a649b" - -[[package]] -name = "const_format" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" -dependencies = [ - "const_format_proc_macros", -] - -[[package]] -name = "const_format_proc_macros" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "constant_time_eq" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "core_maths" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" -dependencies = [ - "libm", -] - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "csscolorparser" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" -dependencies = [ - "phf", - "serde", -] - -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[package]] -name = "data-url" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" - -[[package]] -name = "deflate" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" -dependencies = [ - "adler32", - "byteorder", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "directories" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dmg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abc28c350337837f23b4750f774371f63db232338c9f89bdb9eb48523a7c4722" -dependencies = [ - "log", - "plist", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "exr" -version = "1.72.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide 0.7.4", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] -name = "fastrand" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "filedescriptor" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e" -dependencies = [ - "libc", - "thiserror", - "winapi", -] - -[[package]] -name = "filetime" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" -dependencies = [ - "cfg-if", - "libc", - "libredox", - "windows-sys 0.59.0", -] - -[[package]] -name = "firefoxpwa" -version = "0.0.0" -dependencies = [ - "ab_glyph", - "anyhow", - "blake3", - "byteorder", - "bzip2", - "cfg-if", - "cfg_aliases", - "clap", - "clap_complete", - "configparser", - "const_format", - "data-url", - "directories", - "dmg", - "fs_extra", - "gag", - "glob", - "icns", - "image", - "log", - "phf", - "pix", - "plist", - "reqwest", - "resvg", - "sanitize-filename", - "serde", - "serde_json", - "serde_with", - "simplelog", - "smart-default", - "tar", - "tempfile", - "ulid", - "url", - "urlencoding", - "web_app_manifest", - "windows", - "winreg", -] - -[[package]] -name = "flate2" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" -dependencies = [ - "crc32fast", - "miniz_oxide 0.8.0", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "spin", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "fontconfig-parser" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" -dependencies = [ - "roxmltree", -] - -[[package]] -name = "fontdb" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37be9fc20d966be438cd57a45767f73349477fb0f85ce86e000557f787298afb" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2", - "slotmap", - "tinyvec", - "ttf-parser", -] - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-core", - "futures-io", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gag" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a713bee13966e9fbffdf7193af71d54a6b35a0bb34997cd6c9519ebeb5005972" -dependencies = [ - "filedescriptor", - "tempfile", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gif" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "h2" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http", - "indexmap 2.5.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" - -[[package]] -name = "hyper" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" -dependencies = [ - "futures-util", - "http", - "hyper", - "hyper-util", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2", - "tokio", - "tower", - "tower-service", - "tracing", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core 0.52.0", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "icns" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ccfbad7e08da70a5b48a924994a5afd93125ce5d45a3b0ba0b8da7bda59a40" -dependencies = [ - "byteorder", - "png 0.16.8", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "image" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" -dependencies = [ - "bytemuck", - "byteorder-lite", - "color_quant", - "exr", - "gif", - "image-webp", - "num-traits", - "png 0.17.13", - "qoi", - "ravif", - "rayon", - "rgb", - "tiff", - "zune-core", - "zune-jpeg", -] - -[[package]] -name = "image-webp" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" -dependencies = [ - "byteorder-lite", - "quick-error 2.0.1", -] - -[[package]] -name = "imagesize" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" - -[[package]] -name = "imgref" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" -dependencies = [ - "equivalent", - "hashbrown 0.14.5", - "serde", -] - -[[package]] -name = "interpolate_name" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - -[[package]] -name = "js-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kurbo" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5aa9f0f96a938266bdb12928a67169e8d22c6a786fda8ed984b85e6ba93c3c" -dependencies = [ - "arrayvec", - "smallvec", -] - -[[package]] -name = "language-tags" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" -dependencies = [ - "serde", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[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.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" - -[[package]] -name = "libfuzzer-sys" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" -dependencies = [ - "arbitrary", - "cc", - "once_cell", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", - "redox_syscall", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "loop9" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" -dependencies = [ - "imgref", -] - -[[package]] -name = "maybe-rayon" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memmap2" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" -dependencies = [ - "libc", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime" -version = "0.4.0-a.0" -source = "git+https://github.com/filips123/mime?branch=implement-eq-partialeq#57416f447a10c3343df7fe80deb0ae8a7c77cf0a" -dependencies = [ - "mime-parse", - "quoted-string", - "serde", -] - -[[package]] -name = "mime-parse" -version = "0.0.0" -source = "git+https://github.com/filips123/mime?branch=implement-eq-partialeq#57416f447a10c3343df7fe80deb0ae8a7c77cf0a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "miniz_oxide" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" -dependencies = [ - "adler2", -] - -[[package]] -name = "mio" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" -dependencies = [ - "hermit-abi", - "libc", - "wasi", - "windows-sys 0.52.0", -] - -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "noop_proc_macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" - -[[package]] -name = "num-bigint" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - -[[package]] -name = "object" -version = "0.36.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openssl" -version = "0.10.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "300.3.2+3.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "owned_ttf_parser" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" -dependencies = [ - "ttf-parser", -] - -[[package]] -name = "parse-display" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6509d08722b53e8dafe97f2027b22ccbe3a5db83cb352931e9716b0aa44bc5c" -dependencies = [ - "once_cell", - "parse-display-derive", - "regex", -] - -[[package]] -name = "parse-display-derive" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68517892c8daf78da08c0db777fcc17e07f2f63ef70041718f8a7630ad84f341" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "regex", - "regex-syntax 0.7.5", - "structmeta", - "syn", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher 0.3.11", -] - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pix" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de5067af0cd27add969cdb4ef2eecc955f59235f3b7a75a3c6ac9562cfb6b81" - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "plist" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" -dependencies = [ - "base64", - "indexmap 2.5.0", - "quick-xml", - "serde", - "time", -] - -[[package]] -name = "png" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "deflate", - "miniz_oxide 0.3.7", -] - -[[package]] -name = "png" -version = "0.17.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide 0.7.4", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "profiling" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" -dependencies = [ - "profiling-procmacros", -] - -[[package]] -name = "profiling-procmacros" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - -[[package]] -name = "quick-xml" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" -dependencies = [ - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "quoted-string" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9586f8867f39941d8e796c18340a9cb5221a018df021169dc3e61c87d9f5f567" -dependencies = [ - "quick-error 1.2.3", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rav1e" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" -dependencies = [ - "arbitrary", - "arg_enum_proc_macro", - "arrayvec", - "av1-grain", - "bitstream-io", - "built", - "cfg-if", - "interpolate_name", - "itertools", - "libc", - "libfuzzer-sys", - "log", - "maybe-rayon", - "new_debug_unreachable", - "noop_proc_macro", - "num-derive", - "num-traits", - "once_cell", - "paste", - "profiling", - "rand", - "rand_chacha", - "simd_helpers", - "system-deps", - "thiserror", - "v_frame", - "wasm-bindgen", -] - -[[package]] -name = "ravif" -version = "0.11.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" -dependencies = [ - "avif-serialize", - "imgref", - "loop9", - "quick-error 2.0.1", - "rav1e", - "rgb", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-automata" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "reqwest" -version = "0.12.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" -dependencies = [ - "async-compression", - "base64", - "bytes", - "encoding_rs", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-tls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime 0.3.17", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-socks", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows-registry", -] - -[[package]] -name = "resvg" -version = "0.43.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7314563c59c7ce31c18e23ad3dd092c37b928a0fa4e1c0a1a6504351ab411d1" -dependencies = [ - "gif", - "image-webp", - "log", - "pico-args", - "rgb", - "svgtypes", - "tiny-skia", - "usvg", - "zune-jpeg", -] - -[[package]] -name = "rgb" -version = "0.8.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "roxmltree" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustix" -version = "0.38.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.23.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" -dependencies = [ - "once_cell", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" -dependencies = [ - "base64", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" - -[[package]] -name = "rustls-webpki" -version = "0.102.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "rustybuzz" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85d1ccd519e61834798eb52c4e886e8c2d7d698dd3d6ce0b1b47eb8557f1181" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "core_maths", - "log", - "smallvec", - "ttf-parser", - "unicode-bidi-mirroring", - "unicode-ccc", - "unicode-properties", - "unicode-script", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "sanitize-filename" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "schannel" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "serde" -version = "1.0.210" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.210" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.128" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" -dependencies = [ - "base64", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.5.0", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "simd_helpers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" -dependencies = [ - "quote", -] - -[[package]] -name = "simplecss" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" -dependencies = [ - "log", -] - -[[package]] -name = "simplelog" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0" -dependencies = [ - "log", - "termcolor", - "time", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slotmap" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" -dependencies = [ - "version_check", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "smart-default" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" -dependencies = [ - "float-cmp", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "structmeta" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ad9e09554f0456d67a69c1584c9798ba733a5b50349a6c0d0948710523922d" -dependencies = [ - "proc-macro2", - "quote", - "structmeta-derive", - "syn", -] - -[[package]] -name = "structmeta-derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "svgtypes" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e" -dependencies = [ - "kurbo", - "siphasher 1.0.1", -] - -[[package]] -name = "syn" -version = "2.0.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" -dependencies = [ - "futures-core", -] - -[[package]] -name = "system-configuration" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "tar" -version = "0.4.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "target-lexicon" -version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - -[[package]] -name = "tempfile" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" -dependencies = [ - "cfg-if", - "fastrand", - "once_cell", - "rustix", - "windows-sys 0.59.0", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tiff" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "libc", - "num-conv", - "num_threads", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tiny-skia" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "png 0.17.13", - "tiny-skia-path", -] - -[[package]] -name = "tiny-skia-path" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tinyvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "pin-project-lite", - "socket2", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" -dependencies = [ - "rustls", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-socks" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" -dependencies = [ - "either", - "futures-util", - "thiserror", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" -dependencies = [ - "indexmap 2.5.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "ttf-parser" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" -dependencies = [ - "core_maths", -] - -[[package]] -name = "ulid" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289" -dependencies = [ - "getrandom", - "rand", - "serde", - "web-time", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-bidi-mirroring" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64af057ad7466495ca113126be61838d8af947f41d93a949980b2389a118082f" - -[[package]] -name = "unicode-ccc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-properties" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" - -[[package]] -name = "unicode-script" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" - -[[package]] -name = "unicode-vo" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" - -[[package]] -name = "unicode-xid" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "usvg" -version = "0.43.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6803057b5cbb426e9fb8ce2216f3a9b4ca1dd2c705ba3cbebc13006e437735fd" -dependencies = [ - "base64", - "data-url", - "flate2", - "fontdb", - "imagesize", - "kurbo", - "log", - "pico-args", - "roxmltree", - "rustybuzz", - "simplecss", - "siphasher 1.0.1", - "strict-num", - "svgtypes", - "tiny-skia-path", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "xmlwriter", -] - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "v_frame" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" -dependencies = [ - "aligned-vec", - "num-traits", - "wasm-bindgen", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" - -[[package]] -name = "web-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web_app_manifest" -version = "0.0.0" -source = "git+https://github.com/filips123/WebAppManifestRS?branch=main#477c5bbc7406eec01aea40e18338dafcec78c917" -dependencies = [ - "csscolorparser", - "language-tags", - "mime 0.4.0-a.0", - "parse-display", - "serde", - "serde_with", - "smart-default", - "thiserror", - "url", -] - -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "windows-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" -dependencies = [ - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winnow" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - -[[package]] -name = "xmlwriter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" - -[[package]] -name = "zstd" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" -dependencies = [ - "cc", - "pkg-config", -] - -[[package]] -name = "zune-core" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "zune-jpeg" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" -dependencies = [ - "zune-core", -] diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix index 83a0fb0da460..b6d6791100b1 100644 --- a/pkgs/by-name/fi/firefoxpwa/package.nix +++ b/pkgs/by-name/fi/firefoxpwa/package.nix @@ -28,25 +28,20 @@ rustPlatform.buildRustPackage rec { pname = "firefoxpwa"; - version = "2.13.1"; + version = "2.13.2"; src = fetchFromGitHub { owner = "filips123"; repo = "PWAsForFirefox"; rev = "v${version}"; - hash = "sha256-eZNbM2T7Owu11b7NHqHExm3MYF+LfMGOYKOhZRxjZ28="; + hash = "sha256-0VHuS507uQXaRRYjaJ9uPh1bhPrxA6PQa/x5o4IE78U="; }; sourceRoot = "${src.name}/native"; buildFeatures = [ "immutable-runtime" ]; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "mime-0.4.0-a.0" = "sha256-LjM7LH6rL3moCKxVsA+RUL9lfnvY31IrqHa9pDIAZNE="; - "web_app_manifest-0.0.0" = "sha256-G+kRN8AEmAY1TxykhLmgoX8TG8y2lrv7SCRJlNy0QzA="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-UxUXXF13YyS+ViEsjjfuNinq7n4W28J+fZsy/WeV6Dc="; preConfigure = '' sed -i 's;version = "0.0.0";version = "${version}";' Cargo.toml From 35b9acd3d4c7b5beb7ac51795aaa0552b313913a Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Thu, 9 Jan 2025 17:48:04 -0500 Subject: [PATCH 46/81] firefoxpwa: remove adamcstephens as maintainer --- pkgs/by-name/fi/firefoxpwa/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix index b6d6791100b1..831980a63bd8 100644 --- a/pkgs/by-name/fi/firefoxpwa/package.nix +++ b/pkgs/by-name/fi/firefoxpwa/package.nix @@ -153,7 +153,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mpl20; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ - adamcstephens camillemndn pasqui23 ]; From 4c826d557bb0670918d88ee3634935cbfd44ff8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 01:07:37 +0000 Subject: [PATCH 47/81] kdePackages.pulseaudio-qt: 1.6.1 -> 1.7.0 --- pkgs/kde/misc/pulseaudio-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/kde/misc/pulseaudio-qt/default.nix b/pkgs/kde/misc/pulseaudio-qt/default.nix index ae64cdd0e0f3..0160c98e7fc5 100644 --- a/pkgs/kde/misc/pulseaudio-qt/default.nix +++ b/pkgs/kde/misc/pulseaudio-qt/default.nix @@ -7,11 +7,11 @@ }: mkKdeDerivation rec { pname = "pulseaudio-qt"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { url = "mirror://kde/stable/pulseaudio-qt/pulseaudio-qt-${version}.tar.xz"; - hash = "sha256-8hvzDy/z5nDSBG+WYGncI/XmU/9Wus24kgwTdCZMvB4="; + hash = "sha256-ahjbdt0rzD332ak3nAJSlYFyZLqh8u2Mqqx9pE4E6TE="; }; extraNativeBuildInputs = [ pkg-config ]; From 08d3f7b8138cf02231763c7c6105da209e7d96f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 01:13:34 +0000 Subject: [PATCH 48/81] cables: 0.4.4 -> 0.5.0 --- pkgs/by-name/ca/cables/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cables/package.nix b/pkgs/by-name/ca/cables/package.nix index 91662daf5a46..0cc7ca77c2d8 100644 --- a/pkgs/by-name/ca/cables/package.nix +++ b/pkgs/by-name/ca/cables/package.nix @@ -7,12 +7,12 @@ let pname = "cables"; - version = "0.4.4"; + version = "0.5.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage"; - sha256 = "sha256-+PMENdKs/bcmszlrk0hQILZzKCV8uQbCgR0bbKMk7ic="; + sha256 = "sha256-rwnCIIPQ7a+SDehtl72Q3K3igJmVcOyhKUb9lpW7Zvo="; }; appimageContents = appimageTools.extract { From 5a51e70e7545cc72816eb01c4f840459160cd316 Mon Sep 17 00:00:00 2001 From: eilvelia Date: Tue, 10 Dec 2024 00:22:37 +0000 Subject: [PATCH 49/81] opam: fix opam sandboxing on nixos, cleanup To make opam sandboxing (via bwrap) work on nixos, the following had been used here: --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ However, OPAM_USER_PATH_RO has been removed in opam 2.2.0, requiring a new workaround: https://github.com/ocaml/opam/commit/9b6370d6fef68750f41435261ee2965c49e8806a (Before this commit, executing `opam init` would display that sandboxing fails with "bwrap: execvp sh: No such file or directory".) - Removes outdated workarounds for ocp-build and argv0, cleans postInstall - Fixes link to the changelog which was broken because of "with lib;" --- pkgs/development/tools/ocaml/opam/default.nix | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 4818e72f047a..6911d3d25109 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -4,12 +4,12 @@ assert lib.versionAtLeast ocaml.version "4.08.0"; -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "opam"; version = "2.3.0"; src = fetchurl { - url = "https://github.com/ocaml/opam/releases/download/2.3.0/opam-full-2.3.0.tar.gz"; + url = "https://github.com/ocaml/opam/releases/download/${finalAttrs.version}/opam-full-${finalAttrs.version}.tar.gz"; hash = "sha256-UGunaGXcMVtn35qonnq9XBqJen8KkteyaUl0/cUys0Y="; }; @@ -23,36 +23,30 @@ stdenv.mkDerivation { patches = [ ./opam-shebangs.patch ]; preConfigure = '' - patchShebangs src/state/shellscripts + # Fix opam sandboxing on nixos. Remove after opam >= 2.4.0 is released + substituteInPlace src/state/shellscripts/bwrap.sh \ + --replace-fail 'for dir in /*; do' 'for dir in /{*,run/current-system/sw}; do' ''; configureFlags = [ "--with-vendored-deps" "--with-mccs" ]; - # Dirty, but apparently ocp-build requires a TERM - makeFlags = ["TERM=screen"]; - outputs = [ "out" "installer" ]; setOutputFlags = false; - # change argv0 to "opam" as a workaround for - # https://github.com/ocaml/opam/issues/2142 postInstall = '' - mv $out/bin/opam $out/bin/.opam-wrapped - makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ - --argv0 "opam" \ - --suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.hostPlatform.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ - --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ + wrapProgram $out/bin/opam \ + --suffix PATH : ${lib.makeBinPath ([ curl getconf unzip ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap ])} $out/bin/opam-installer --prefix=$installer opam-installer.install ''; doCheck = false; - meta = with lib; { + meta = { description = "Package manager for OCaml"; homepage = "https://opam.ocaml.org/"; - changelog = "https://github.com/ocaml/opam/raw/${version}/CHANGES"; + changelog = "https://github.com/ocaml/opam/raw/${finalAttrs.version}/CHANGES"; maintainers = [ ]; - license = licenses.lgpl21Only; - platforms = platforms.all; + license = lib.licenses.lgpl21Only; + platforms = lib.platforms.all; }; -} +}) From 83615f056e15158b5cfebe94b82dc365f08837e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 02:01:14 +0000 Subject: [PATCH 50/81] prometheus-nginx-exporter: 1.4.0 -> 1.4.1 --- pkgs/servers/monitoring/prometheus/nginx-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 334a49bcdf6a..8f1d9e765bee 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "nginx_exporter"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "nginxinc"; repo = "nginx-prometheus-exporter"; rev = "v${version}"; - sha256 = "sha256-aA6wQjTVkyEx+f1xBdrvN05NGqnJkgLVwrNLSh5+Ll0="; + sha256 = "sha256-yujMufcL4uJHxbEd8mwqxPmPlopVm6szkDxz+GZITio="; }; - vendorHash = "sha256-ua3Cm1VXRs3M58vJ/fEt7SH+ZYegt0WjOGRV/iU8qZk="; + vendorHash = "sha256-csBnUeuzkqgk5+62w0GZS2gX5jscPhN1z85KBVCMA0I="; ldflags = let From 97c78583923bcd16c0ab451e720b91bcb2cbf507 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Thu, 9 Jan 2025 18:19:21 -0800 Subject: [PATCH 51/81] libsixel: 1.10.3 -> 1.10.5 --- pkgs/by-name/li/libsixel/fix-CVE-2021-45340.patch | 12 ------------ pkgs/by-name/li/libsixel/package.nix | 9 ++------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 pkgs/by-name/li/libsixel/fix-CVE-2021-45340.patch diff --git a/pkgs/by-name/li/libsixel/fix-CVE-2021-45340.patch b/pkgs/by-name/li/libsixel/fix-CVE-2021-45340.patch deleted file mode 100644 index 33e075700bb5..000000000000 --- a/pkgs/by-name/li/libsixel/fix-CVE-2021-45340.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/stb_image.h b/src/stb_image.h -index f12c30b..526281c 100644 ---- a/src/stb_image.h -+++ b/src/stb_image.h -@@ -1534,6 +1534,7 @@ static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int r - int i,j; - unsigned char *good; - -+ if (data == NULL) return data; - if (req_comp == img_n) return data; - STBI_ASSERT(req_comp >= 1 && req_comp <= 4); - diff --git a/pkgs/by-name/li/libsixel/package.nix b/pkgs/by-name/li/libsixel/package.nix index d9407b25e7d8..186920ccf282 100644 --- a/pkgs/by-name/li/libsixel/package.nix +++ b/pkgs/by-name/li/libsixel/package.nix @@ -10,20 +10,15 @@ }: stdenv.mkDerivation rec { pname = "libsixel"; - version = "1.10.3"; + version = "1.10.5"; src = fetchFromGitHub { owner = "libsixel"; repo = "libsixel"; rev = "v${version}"; - sha256 = "1nny4295ipy4ajcxmmh04c796hcds0y7z7rv3qd17mj70y8j0r2d"; + hash = "sha256-obzBZAknN3N7+Bvtd0+JHuXcemVb7wRv+Pt4VjS6Bck="; }; - patches = [ - # https://github.com/NixOS/nixpkgs/issues/160670 - ./fix-CVE-2021-45340.patch - ]; - buildInputs = [ gdk-pixbuf gd From 6d10d8adf8453a59c220d9c65fed6ea4a4956911 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 02:51:28 +0000 Subject: [PATCH 52/81] kubescape: 3.0.22 -> 3.0.23 --- pkgs/by-name/ku/kubescape/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubescape/package.nix b/pkgs/by-name/ku/kubescape/package.nix index 0d79437dedf2..845fd6110169 100644 --- a/pkgs/by-name/ku/kubescape/package.nix +++ b/pkgs/by-name/ku/kubescape/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "kubescape"; - version = "3.0.22"; + version = "3.0.23"; src = fetchFromGitHub { owner = "kubescape"; repo = "kubescape"; tag = "v${version}"; - hash = "sha256-m1tfYuRDPxm8Q1e4RIzqfkv9vOjGUPvI0FADvYXep/c="; + hash = "sha256-LC5m+r38mm5c8dmlo4+E5eWlfF0xJIglTcGpvY3EDOg="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-+DmElfOZcSnGaxEj4Ca1ysIb1M7N0kxtJx8+TXFOREY="; + vendorHash = "sha256-J8+GyOgzR2MkJSskM7lzloyKw/JywCT38WFnosg6ACM="; subPackages = [ "." ]; From ecbc3c2a87d8f9850e4fd5f13469e6269be8bec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= Date: Thu, 9 Jan 2025 20:40:34 +0100 Subject: [PATCH 53/81] stumpwm: 22.11 -> 24.11 Moved outside lisp-modules to a separate package, so as to re-use its Makefile-based build-system and make a step in the direction of leaving just development libraries in lisp-modules. --- .../services/x11/window-managers/stumpwm.nix | 5 ++- .../window-managers/stumpwm/default.nix | 41 +++++++++++++++++ pkgs/development/lisp-modules/packages.nix | 44 +++---------------- pkgs/top-level/all-packages.nix | 9 +++- 4 files changed, 57 insertions(+), 42 deletions(-) create mode 100644 pkgs/applications/window-managers/stumpwm/default.nix diff --git a/nixos/modules/services/x11/window-managers/stumpwm.nix b/nixos/modules/services/x11/window-managers/stumpwm.nix index b97de030d7f6..8262d467c53b 100644 --- a/nixos/modules/services/x11/window-managers/stumpwm.nix +++ b/nixos/modules/services/x11/window-managers/stumpwm.nix @@ -14,16 +14,17 @@ in { options = { services.xserver.windowManager.stumpwm.enable = mkEnableOption "stumpwm"; + services.xserver.windowManager.stumpwm.package = mkPackageOption pkgs "stumpwm" { }; }; config = mkIf cfg.enable { services.xserver.windowManager.session = singleton { name = "stumpwm"; start = '' - ${pkgs.sbclPackages.stumpwm}/bin/stumpwm & + ${cfg.package}/bin/stumpwm & waitPID=$! ''; }; - environment.systemPackages = [ pkgs.sbclPackages.stumpwm ]; + environment.systemPackages = [ cfg.package ]; }; } diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix new file mode 100644 index 000000000000..be926cdc5a82 --- /dev/null +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -0,0 +1,41 @@ +{ + stdenv, + lib, + fetchFromGitHub, + autoreconfHook, + sbcl, + texinfo, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "stumpwm"; + version = "24.11"; + + src = fetchFromGitHub { + owner = "stumpwm"; + repo = "stumpwm"; + rev = "${finalAttrs.version}"; + hash = "sha256-Ba2HcAmNcZvnqU0jpLTxsBe8L+4aHbO/oM4Bp/IYEC0="; + }; + + nativeBuildInputs = [ + autoreconfHook + sbcl + texinfo + ]; + + doCheck = true; + + postConfigure = '' + export ASDF_OUTPUT_TRANSLATIONS=$(pwd):$(pwd) + ''; + + meta = { + description = "Tiling, keyboard driven window manager"; + homepage = "https://stumpwm.github.io/"; + license = lib.licenses.gpl2Plus; + mainProgram = "stumpwm"; + maintainers = lib.teams.lisp.members; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 801fce5447cf..efb3e221fe05 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -190,45 +190,12 @@ let lispLibs = super.mathkit.lispLibs ++ [ super.sb-cga ]; }; - stumpwm = super.stumpwm.overrideLispAttrs (o: rec { - version = "22.11"; - src = pkgs.fetchFromGitHub { - owner = "stumpwm"; - repo = "stumpwm"; - rev = version; - hash = "sha256-zXj17ucgyFhv7P0qEr4cYSVRPGrL1KEIofXWN2trr/M="; + stumpwm = super.stumpwm.overrideAttrs { + inherit (pkgs.stumpwm) src version; + meta = { + inherit (pkgs.stumpwm.meta) description license homepage; }; - buildScript = pkgs.writeText "build-stumpwm.lisp" '' - (load "${super.stumpwm.asdfFasl}/asdf.${super.stumpwm.faslExt}") - - (asdf:load-system 'stumpwm) - - ;; Prevents package conflict error - (when (uiop:version<= "3.1.5" (asdf:asdf-version)) - (uiop:symbol-call '#:asdf '#:register-immutable-system :stumpwm) - (dolist (system-name (uiop:symbol-call '#:asdf - '#:system-depends-on - (asdf:find-system :stumpwm))) - (uiop:symbol-call '#:asdf '#:register-immutable-system system-name))) - - ;; Prevents "cannot create /homeless-shelter" error - (asdf:disable-output-translations) - - (sb-ext:save-lisp-and-die - "stumpwm" - :executable t - :purify t - #+sb-core-compression :compression - #+sb-core-compression t - :toplevel #'stumpwm:stumpwm) - ''; - installPhase = '' - mkdir -p $out/bin - cp -v stumpwm $out/bin - ''; - }); - - stumpwm-unwrapped = super.stumpwm; + }; clfswm = super.clfswm.overrideAttrs (o: rec { buildScript = pkgs.writeText "build-clfswm.lisp" '' @@ -471,6 +438,7 @@ let } // optionalAttrs pkgs.config.allowAliases { cl-glib_dot_gio = throw "cl-glib_dot_gio was replaced by cl-gio"; cl-gtk4_dot_webkit2 = throw "cl-gtk4_dot_webkit2 was replaced by cl-gtk4_dot_webkit"; + stumpwm-unwrapped = throw "stumpwm-unwrapped is now just stumpwm"; }); in packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13c8356e50ce..40adafd50c32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15323,9 +15323,14 @@ with pkgs; inherit (ocaml-ng.ocamlPackages) stog; - stumpwm = sbclPackages.stumpwm; + stumpwm = callPackage ../applications/window-managers/stumpwm { + stdenv = stdenvNoCC; + sbcl = sbcl.withPackages (ps: with ps; [ + alexandria cl-ppcre clx fiasco + ]); + }; - stumpwm-unwrapped = sbclPackages.stumpwm-unwrapped; + stumpwm-unwrapped = sbclPackages.stumpwm; sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { }); From fd457e531541981e13cc42e2531e71d378b9a94f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 9 Jan 2025 21:28:39 -0600 Subject: [PATCH 54/81] vimPlugins: add missing dependencies Discovered during fixing neovimRequireCheckHook ignores. --- .../editors/vim/plugins/overrides.nix | 62 ++++++++++++++++++- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index c84d0e792ad0..520b58232437 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -745,6 +745,14 @@ in ]; }; + conjure = super.conjure.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + nvimSkipModule = [ + # Test mismatch of directory because of nix generated path + "conjure-spec.client.fennel.nfnl_spec" + ]; + }; + context-vim = super.context-vim.overrideAttrs { # Vim plugin with optional lua highlight module nvimSkipModule = "context.highlight"; @@ -1832,9 +1840,20 @@ in neotest nvim-nio plenary-nvim + nvim-treesitter-parsers.cpp + ]; + nvimSkipModule = [ + # lua/plenary/path.lua:511: FileNotFoundError from mkdir because of stdpath parent path missing + "neotest-gtest.executables.global_registry" + "neotest-gtest.executables.init" + "neotest-gtest.executables.registry" + "neotest-gtest.executables.ui" + "neotest-gtest" + "neotest-gtest.neotest_adapter" + "neotest-gtest.report" + "neotest-gtest.storage" + "neotest-gtest.utils" ]; - # broken - # nvimRequireCheck = "neotest-gtest"; }; neotest-haskell = super.neotest-haskell.overrideAttrs { @@ -1865,6 +1884,7 @@ in neotest-minitest = super.neotest-minitest.overrideAttrs { dependencies = with self; [ neotest + nvim-nio plenary-nvim ]; }; @@ -1918,6 +1938,7 @@ in neotest-rspec = super.neotest-rspec.overrideAttrs { dependencies = with self; [ neotest + nvim-nio plenary-nvim ]; }; @@ -2171,6 +2192,10 @@ in ]; }; + nvim-java-test = super.nvim-java-test.overrideAttrs { + dependencies = [ self.nvim-java-core ]; + }; + nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs { dependencies = [ self.plenary-nvim ]; nvimRequireCheck = "lsp-file-operations"; @@ -2355,6 +2380,29 @@ in nvimRequireCheck = "trevj"; }; + nvim-test = super.nvim-test.overrideAttrs { + dependencies = with self; [ + nvim-treesitter + nvim-treesitter-parsers.c_sharp + nvim-treesitter-parsers.go + nvim-treesitter-parsers.haskell + nvim-treesitter-parsers.javascript + nvim-treesitter-parsers.python + nvim-treesitter-parsers.ruby + nvim-treesitter-parsers.rust + nvim-treesitter-parsers.typescript + nvim-treesitter-parsers.zig + ]; + nvimSkipModule = [ + # Optional toggleterm integration + "nvim-test.terms.toggleterm" + # Broken runners + "nvim-test.runners.zig" + "nvim-test.runners.hspec" + "nvim-test.runners.stack" + ]; + }; + nvim-ufo = super.nvim-ufo.overrideAttrs { dependencies = [ self.promise-async ]; nvimRequireCheck = "ufo"; @@ -2575,6 +2623,8 @@ in nvimSkipModule = [ # rainbow-delimiters.types.lua "rainbow-delimiters.types" + # Test that requires an unpackaged dependency + "rainbow-delimiters._test.highlight" ]; }; @@ -3152,6 +3202,14 @@ in meta.maintainers = with lib.maintainers; [ enderger ]; }; + typescript-nvim = super.typescript-nvim.overrideAttrs { + dependencies = with self; [ + nvim-lspconfig + ]; + # Optional null-ls integration + nvimSkipModule = [ "typescript.extensions.null-ls.code-actions.init" ]; + }; + typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs { dependencies = with self; [ nvim-lspconfig From a62ac1793ff6faf397ab0d9102435872164506ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 04:56:47 +0000 Subject: [PATCH 55/81] walker: 0.11.16 -> 0.11.19 --- pkgs/by-name/wa/walker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/walker/package.nix b/pkgs/by-name/wa/walker/package.nix index a1e9087b70bf..75903295a9d9 100644 --- a/pkgs/by-name/wa/walker/package.nix +++ b/pkgs/by-name/wa/walker/package.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "walker"; - version = "0.11.16"; + version = "0.11.19"; src = fetchFromGitHub { owner = "abenz1267"; repo = "walker"; rev = "v${version}"; - hash = "sha256-9cZ+cJcBiZA0HU8YU7+DmOPmbeFtuiqmyBEosVxCADQ="; + hash = "sha256-dt6dGl/1KGmnG8g9iv+EL7xYXVVy48tizg9aGunh1QU="; }; vendorHash = "sha256-urAtl2aSuNw7UVnuacSACUE8PCwAsrRQbuMb7xItjao="; From 3982dd5fdf62959eb4d2828a488eefd40dc47efc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 05:22:57 +0000 Subject: [PATCH 56/81] github-backup: 0.47.0 -> 0.48.0 --- pkgs/by-name/gi/github-backup/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/github-backup/package.nix b/pkgs/by-name/gi/github-backup/package.nix index f067d3b94be4..010d93df70f4 100644 --- a/pkgs/by-name/gi/github-backup/package.nix +++ b/pkgs/by-name/gi/github-backup/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "github-backup"; - version = "0.47.0"; + version = "0.48.0"; pyproject = true; src = fetchFromGitHub { owner = "josegonzalez"; repo = "python-github-backup"; tag = version; - hash = "sha256-BnsPVSyQuoNH56M2ZwOyWGXjWI9sGS1S8vQzCQEqNcY="; + hash = "sha256-vJD+dzKHYgiDme+wXklbxkbOPKwbilOWfJknsS37+vw="; }; build-system = with python3Packages; [ From 8607f87ddd317f24c2f14b90479315943437ecfe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 05:24:02 +0000 Subject: [PATCH 57/81] ldeep: 1.0.78 -> 1.0.79 --- pkgs/by-name/ld/ldeep/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ld/ldeep/package.nix b/pkgs/by-name/ld/ldeep/package.nix index 6fee78ff4f0d..3c43a5cfe6bb 100644 --- a/pkgs/by-name/ld/ldeep/package.nix +++ b/pkgs/by-name/ld/ldeep/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.78"; + version = "1.0.79"; pyproject = true; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; tag = version; - hash = "sha256-ExAZrlrsx6ijTeUSiPNL06wY4gWUuCNajpyXqpq785I="; + hash = "sha256-tq5M1YOTiXHdv8dTw2acnBzz0lZu6TtZFEi9rC1Sx14="; }; pythonRelaxDeps = [ From dfb323c3f3a4c6dbd671efa236df3df6f59dee2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 05:50:24 +0000 Subject: [PATCH 58/81] mangojuice: 0.7.9 -> 0.8.0 --- pkgs/by-name/ma/mangojuice/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix index f3821f83b68a..5643fb8effca 100644 --- a/pkgs/by-name/ma/mangojuice/package.nix +++ b/pkgs/by-name/ma/mangojuice/package.nix @@ -22,13 +22,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mangojuice"; - version = "0.7.9"; + version = "0.8.0"; src = fetchFromGitHub { owner = "radiolamp"; repo = "mangojuice"; tag = finalAttrs.version; - hash = "sha256-L+wxRmpCAfrvLE9IHAT9g+F/clXlQAkLpbnMJwC8RxY="; + hash = "sha256-LSwn6PIAGX1FIofnmoM2eqnhZBa3gkhlOBUJtdR9gWE="; }; nativeBuildInputs = [ From 346e53ea6c00d4a4efa801645339f8f880cda371 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 05:57:50 +0000 Subject: [PATCH 59/81] polarity: latest-unstable-2024-12-20 -> latest-unstable-2025-01-08 --- pkgs/by-name/po/polarity/Cargo.lock | 250 ++++++++++++--------------- pkgs/by-name/po/polarity/package.nix | 8 +- 2 files changed, 114 insertions(+), 144 deletions(-) diff --git a/pkgs/by-name/po/polarity/Cargo.lock b/pkgs/by-name/po/polarity/Cargo.lock index 1061dc760357..bdcd45c62e87 100644 --- a/pkgs/by-name/po/polarity/Cargo.lock +++ b/pkgs/by-name/po/polarity/Cargo.lock @@ -88,9 +88,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "arrayvec" @@ -133,7 +133,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] @@ -323,13 +323,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.83" +version = "0.1.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] @@ -346,7 +346,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] @@ -360,6 +360,9 @@ name = "backend" version = "0.1.0" dependencies = [ "ast", + "miette", + "printer", + "thiserror", "url", ] @@ -465,9 +468,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.11.0" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22" +checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0" dependencies = [ "memchr", "regex-automata", @@ -494,9 +497,9 @@ checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cc" -version = "1.2.3" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d" +checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" dependencies = [ "shlex", ] @@ -537,9 +540,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.38" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9647a559c112175f17cf724dc72d3645680a883c58481332779192b0d8e7a01" +checksum = "ac2e663e3e3bed2d32d065a8404024dad306e699a04263ec59919529f803aee9" dependencies = [ "clap", ] @@ -553,7 +556,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] @@ -565,9 +568,8 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "codespan" version = "0.11.1" -source = "git+https://github.com/polarity-lang/codespan.git?rev=542320ab177fd38fff3a398a97b3f0352e065149#542320ab177fd38fff3a398a97b3f0352e065149" +source = "git+https://github.com/polarity-lang/codespan.git?rev=91e4f64801cee923661097eb35e05a782996d8ea#91e4f64801cee923661097eb35e05a782996d8ea" dependencies = [ - "lsp-types 0.91.1", "url", ] @@ -632,18 +634,18 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.13" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -660,9 +662,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" @@ -746,7 +748,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] @@ -779,6 +781,7 @@ version = "0.1.0" dependencies = [ "ast", "async-trait", + "backend", "codespan", "elaborator", "log", @@ -835,9 +838,9 @@ dependencies = [ [[package]] name = "env_filter" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" dependencies = [ "log", "regex", @@ -845,9 +848,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" dependencies = [ "anstream", "anstyle", @@ -928,9 +931,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fixedbitset" @@ -1056,7 +1059,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] @@ -1248,9 +1251,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" +checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" dependencies = [ "bytes", "futures-channel", @@ -1268,9 +1271,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.3" +version = "0.27.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ "futures-util", "http", @@ -1433,7 +1436,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] @@ -1627,9 +1630,9 @@ checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25" [[package]] name = "libc" -version = "0.2.167" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libm" @@ -1680,18 +1683,18 @@ dependencies = [ [[package]] name = "logos" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c6b6e02facda28ca5fb8dbe4b152496ba3b1bd5a4b40bb2b1b2d8ad74e0f39b" +checksum = "7251356ef8cb7aec833ddf598c6cb24d17b689d20b993f9d11a3d764e34e6458" dependencies = [ "logos-derive", ] [[package]] name = "logos-codegen" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f3303189202bb8a052bcd93d66b6c03e6fe70d9c7c47c0ea5e974955e54c876" +checksum = "59f80069600c0d66734f5ff52cc42f2dabd6b29d205f333d61fd7832e9e9963f" dependencies = [ "beef", "fnv", @@ -1699,15 +1702,14 @@ dependencies = [ "proc-macro2", "quote", "regex-syntax 0.8.5", - "rustc_version", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] name = "logos-derive" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774a1c225576486e4fdf40b74646f672c542ca3608160d348749693ae9d456e6" +checksum = "24fb722b06a9dc12adb0963ed585f19fc61dc5413e6a9be9422ef92c091e731d" dependencies = [ "logos-codegen", ] @@ -1769,19 +1771,6 @@ dependencies = [ "url", ] -[[package]] -name = "lsp-types" -version = "0.91.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2368312c59425dd133cb9a327afee65be0a633a8ce471d248e2202a48f8f68ae" -dependencies = [ - "bitflags 1.3.2", - "serde", - "serde_json", - "serde_repr", - "url", -] - [[package]] name = "lsp-types" version = "0.97.0" @@ -1854,7 +1843,7 @@ checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] @@ -1889,9 +1878,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" dependencies = [ "adler2", ] @@ -1995,9 +1984,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.5" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "memchr", ] @@ -2047,7 +2036,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] @@ -2250,9 +2239,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "predicates" -version = "3.1.2" +version = "3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" +checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573" dependencies = [ "anstyle", "difflib", @@ -2261,15 +2250,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" +checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa" [[package]] name = "predicates-tree" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" +checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c" dependencies = [ "predicates-core", "termtree", @@ -2317,9 +2306,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -2376,9 +2365,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ "bitflags 2.6.0", ] @@ -2437,9 +2426,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.9" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" +checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" dependencies = [ "base64 0.22.1", "bytes", @@ -2466,10 +2455,11 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.2", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", + "tower", "tower-service", "url", "wasm-bindgen", @@ -2528,33 +2518,24 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc_version" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" -dependencies = [ - "semver", -] - [[package]] name = "rustix" -version = "0.38.41" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "rustls" -version = "0.23.19" +version = "0.23.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" +checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" dependencies = [ "once_cell", "rustls-pki-types", @@ -2574,9 +2555,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" [[package]] name = "rustls-webpki" @@ -2591,9 +2572,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" @@ -2640,45 +2621,39 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" +checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" dependencies = [ "core-foundation-sys", "libc", ] -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - [[package]] name = "serde" -version = "1.0.215" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" dependencies = [ "itoa", "memchr", @@ -2694,7 +2669,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] @@ -2823,21 +2798,15 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.90" +version = "2.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.2" @@ -2855,7 +2824,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] @@ -2970,12 +2939,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.14.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" dependencies = [ "cfg-if", "fastrand", + "getrandom", "once_cell", "rustix", "windows-sys 0.59.0", @@ -3023,9 +2993,9 @@ dependencies = [ [[package]] name = "termtree" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" +checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" [[package]] name = "test-runner" @@ -3077,7 +3047,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] @@ -3189,14 +3159,15 @@ dependencies = [ [[package]] name = "tower" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", "pin-project-lite", - "sync_wrapper 0.1.2", + "sync_wrapper", + "tokio", "tower-layer", "tower-service", ] @@ -3219,7 +3190,7 @@ dependencies = [ "dashmap", "futures", "httparse", - "lsp-types 0.97.0", + "lsp-types", "memchr", "serde", "serde_json", @@ -3235,7 +3206,7 @@ source = "git+https://github.com/tower-lsp/tower-lsp?rev=19f5a87810ff4b643d2bc39 dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] @@ -3263,7 +3234,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] @@ -3301,9 +3272,9 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "unicase" -version = "2.8.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" +checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" [[package]] name = "unicode-ident" @@ -3350,7 +3321,6 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde", ] [[package]] @@ -3460,7 +3430,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", "wasm-bindgen-shared", ] @@ -3496,7 +3466,7 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3711,7 +3681,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", "synstructure", ] @@ -3733,7 +3703,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", ] [[package]] @@ -3753,7 +3723,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", "synstructure", ] @@ -3782,5 +3752,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.94", ] diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix index 282b4e85e5f6..412616857f4b 100644 --- a/pkgs/by-name/po/polarity/package.nix +++ b/pkgs/by-name/po/polarity/package.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "polarity"; - version = "latest-unstable-2024-12-20"; + version = "latest-unstable-2025-01-08"; src = fetchFromGitHub { owner = "polarity-lang"; repo = "polarity"; - rev = "e679bff1d40b2d145fdc5206c74e59321a70efd2"; - hash = "sha256-KiwK9rBYfOtsEiUF+e62L/j1Yc4KloRLXbXZ+5axiEM="; + rev = "bbc91efbc25f77f505d244e96cc566f63f6dc858"; + hash = "sha256-3wKMFX4ubp8bLNhdLoMkZlsP2vfu0wcNpEZrs95xwAY="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "codespan-0.11.1" = "sha256-Wq99v77bqSGIOK/iyv+x/EG1563XSeaTDW5K2X3kSXU="; + "codespan-0.11.1" = "sha256-0cUndjWQ44X5zXVfg7YX/asBByWq/hFV1n9tHPBTcfY="; "tower-lsp-0.20.0" = "sha256-f3S2CyFFX6yylaxMoXhB1/bfizVsLfNldLM+dXl5Y8k="; }; }; From 7710f8346331b2da3bd2faff15daeaf5ad0bfb82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 06:00:16 +0000 Subject: [PATCH 60/81] pkgsite: 0-unstable-2024-12-26 -> 0-unstable-2025-01-08 --- pkgs/by-name/pk/pkgsite/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index 7162b1b0b46f..ddc1bb4e0df0 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "pkgsite"; - version = "0-unstable-2024-12-26"; + version = "0-unstable-2025-01-08"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "8bad909da0cbaf239510644c5a91d1be27376d9f"; - hash = "sha256-EsShGqT2Pk8VdxNRplliPb5+VoD05/sQzGNTsk0VZEI="; + rev = "840de57bb85975c3c0bcb24ba00fee86ef8c0748"; + hash = "sha256-TNnZG9Q3RmB5TfHDqPCHfChsdkZ6FOErbzo47cRXhTw="; }; - vendorHash = "sha256-Ijcj1Nq4WjXcUqmoDkpO9I4rl/4/TMXFMQVAlEK11R8="; + vendorHash = "sha256-Z+Ji3RO2zn5vn9DXOAxyeI4OZXGOfyVdfdIsNyJHZpE="; subPackages = [ "cmd/pkgsite" ]; From a895f157d3cfc243c628af10fc0c39391684c5a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 06:59:45 +0000 Subject: [PATCH 61/81] python312Packages.rapidfuzz: 3.10.1 -> 3.11.0 --- pkgs/development/python-modules/rapidfuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index e4c8abe035ea..f8a03c1c131b 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.10.1"; + version = "3.11.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; tag = "v${version}"; - hash = "sha256-0L8nkjgWdP/w//M69ZRxYk9If3CIEcnAl9mkJKJ4o1g="; + hash = "sha256-wsY0JCY8unLIMs01SLgQMOu9RQ0qTdPAZ71e6TigTVQ="; }; postPatch = '' From 5311838a0cf1a81c403ac7b3ea3d1e16da93580c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 07:07:01 +0000 Subject: [PATCH 62/81] libretro-core-info: 1.19.0 -> 1.20.0 --- pkgs/by-name/li/libretro-core-info/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libretro-core-info/package.nix b/pkgs/by-name/li/libretro-core-info/package.nix index cf9e84832c73..bbb65756751b 100644 --- a/pkgs/by-name/li/libretro-core-info/package.nix +++ b/pkgs/by-name/li/libretro-core-info/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "libretro-core-info"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-core-info"; rev = "v${version}"; - hash = "sha256-dMMX9i2xPKay6BKC52fYxElcGSllHkSZyOXX/t3l6Io="; + hash = "sha256-T/La/Y9txRX8SHAyOi45KcQA8zb3puXdfTKlPSm42+U="; }; makeFlags = [ From 6c1a1acb31cf4957945b96adbd9df36adda7e781 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jan 2025 08:43:37 +0100 Subject: [PATCH 63/81] python312Packages.mypy-boto3-codebuild: 1.35.93 -> 1.35.96 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index f38ccd788009..9fc2e3ce118f 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -266,8 +266,8 @@ rec { "sha256-00fCatU8SbuxQuw+VAbG1kOJ43asrbGbq8moJw1JzrY="; mypy-boto3-codebuild = - buildMypyBoto3Package "codebuild" "1.35.93" - "sha256-h2/TOx5T7U2iBfOZ6aDyykzEd0A/eiT/5/6fKS4wR1Q="; + buildMypyBoto3Package "codebuild" "1.35.96" + "sha256-SOJAFGd5Yz4TJ49VfjixfchWC0s1xdogZ/2qd5SvDVQ="; mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.35.93" From 48811b06b5792a53cd472a0fecea543c6086f0b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jan 2025 08:43:42 +0100 Subject: [PATCH 64/81] python312Packages.mypy-boto3-compute-optimizer: 1.35.93 -> 1.35.96 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 9fc2e3ce118f..c9a35ddcf6b3 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -330,8 +330,8 @@ rec { "sha256-zBPL1DFdMYELOa3YMMlsUL+j6aDTNcYtAMlTlvkLnF0="; mypy-boto3-compute-optimizer = - buildMypyBoto3Package "compute-optimizer" "1.35.93" - "sha256-hln7MWYK6yPqN77pwGz+013kHyjXgL4xFMycUzJgMMo="; + buildMypyBoto3Package "compute-optimizer" "1.35.96" + "sha256-l6q47Z3FTNzy5/SUH+SZly1JmEz3F96zfj6J9dJXm4U="; mypy-boto3-config = buildMypyBoto3Package "config" "1.35.93" From d018929d2ee0e446aabb4087217de98a14ed7777 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jan 2025 08:43:56 +0100 Subject: [PATCH 65/81] python312Packages.mypy-boto3-fms: 1.35.93 -> 1.35.96 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index c9a35ddcf6b3..de95bf450f24 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -542,8 +542,8 @@ rec { "sha256-jBVQYYUjnU8wbXW3XFSFCb/gnDOqkTgiAx8NCHN82tM="; mypy-boto3-fms = - buildMypyBoto3Package "fms" "1.35.93" - "sha256-V6LNqtede9jv8nsF8FYfTAAC0S9qapucnbG521nPyYM="; + buildMypyBoto3Package "fms" "1.35.96" + "sha256-IFNzmyaKRvoQ+afX1Oy9ZPXiIQqzR3M3NpbCArEhXkI="; mypy-boto3-forecast = buildMypyBoto3Package "forecast" "1.35.93" From 1f1841a61454a4f1e207f20320260fb89d666dcb Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Jan 2025 14:14:17 +0900 Subject: [PATCH 66/81] gemmi: 0.6.7 -> 0.7.0 Diff: https://github.com/project-gemmi/gemmi/compare/refs/tags/v0.6.7...v0.7.0 Changelog: https://github.com/project-gemmi/gemmi/releases/tag/v0.7.0 --- pkgs/by-name/ge/gemmi/package.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ge/gemmi/package.nix b/pkgs/by-name/ge/gemmi/package.nix index 48d78ec8d75b..4082147ec513 100644 --- a/pkgs/by-name/ge/gemmi/package.nix +++ b/pkgs/by-name/ge/gemmi/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gemmi"; - version = "0.6.7"; + version = "0.7.0"; src = fetchFromGitHub { owner = "project-gemmi"; repo = "gemmi"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y7gQSh9C7smoXuGWgpJI3hPIg06Jns+1dBpmMxuCrKE="; + hash = "sha256-XOu//yY5CnnzjvGu7IIC5GvecYsnZQV3Y2wvGVTwWzU="; }; nativeBuildInputs = @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enablePython ( with python3Packages; [ - pybind11 + nanobind python pythonImportsCheckHook ] @@ -44,7 +44,15 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = enablePython; - nativeInstallCheckInputs = [ python3Packages.pytestCheckHook ]; + nativeInstallCheckInputs = with python3Packages; [ + # biopython + numpy + pytestCheckHook + ]; + + preInstallCheck = '' + export PATH=$out/bin:$PATH + ''; pytestFlagsArray = [ "../tests" ]; From f8c4bc25acb28aa7b87f9c4883b62ef20786c835 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jan 2025 09:05:42 +0100 Subject: [PATCH 67/81] python313Packages.rns: 0.8.8 -> 0.8.9 Diff: https://github.com/markqvist/Reticulum/compare/refs/tags/0.8.8...0.8.9 Changelog: https://github.com/markqvist/Reticulum/releases/tag/0.8.9 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index abc7c4284a8f..e994e00d0f19 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.8.8"; + version = "0.8.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; tag = version; - hash = "sha256-Vsh5C0IlOz8/Jw0ya1bOGsNiBQTXJwTWUBcDFs5Zp+0="; + hash = "sha256-yUn7tDAu4DJZFJAMdsSnEjlvCHxp1y7OO8xR86lus54="; }; patches = [ From 95d054f4ac26c3afd0f16769f91ac629b584c6fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jan 2025 09:07:16 +0100 Subject: [PATCH 68/81] python313Packages.twilio: 9.4.1 -> 9.4.2 Diff: https://github.com/twilio/twilio-python/compare/refs/tags/9.4.1...9.4.2 Changelog: https://github.com/twilio/twilio-python/blob/9.4.2/CHANGES.md --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index bda6fe4c7014..a249d6b4624a 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.4.1"; + version = "9.4.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; tag = version; - hash = "sha256-sZhKFnCmARocnOqM1NE6eGU/6UtfJSQTK+bv5HHHU1U="; + hash = "sha256-U3N/0HrZlv3/AtMtf5hvkBB3nzol83XDGLAa7hdCB2w="; }; build-system = [ setuptools ]; From 85b68bc5b60227be505030059a3aaf2659cc93a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jan 2025 09:10:23 +0100 Subject: [PATCH 69/81] python313Packages.python-roborock: 2.8.5 -> 2.9.0 Diff: https://github.com/humbertogontijo/python-roborock/compare/refs/tags/v2.8.5...v2.9.0 Changelog: https://github.com/humbertogontijo/python-roborock/blob/v2.9.0/CHANGELOG.md --- pkgs/development/python-modules/python-roborock/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 78b59af56a25..f89db55a3486 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -2,6 +2,7 @@ lib, stdenv, aiohttp, + aioresponses, async-timeout, buildPythonPackage, click, @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.8.5"; + version = "2.9.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +30,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; tag = "v${version}"; - hash = "sha256-3wUf2J7TncxUdqN3SgAdHwMLbkNXj9Pwf7Zk3OmAThY="; + hash = "sha256-xPbq31mp1XM1WtmrknF9ZXyolxXu+iCMCqJccxC+Qd0="; }; postPatch = '' @@ -53,6 +54,7 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pycryptodomex ]; nativeCheckInputs = [ + aioresponses pytest-asyncio pytestCheckHook ]; From b2a69e584ce6311dddd3d0feffbcbdca83ac9c83 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jan 2025 09:11:30 +0100 Subject: [PATCH 70/81] python313Packages.photutils: 2.0.2 -> 2.1.0 Diff: https://github.com/astropy/photutils/compare/refs/tags/2.0.2...2.1.0 Changelog: https://github.com/astropy/photutils/blob/2.1.0/CHANGES.rst --- pkgs/development/python-modules/photutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix index cf17a0d479ef..1f22a29c9925 100644 --- a/pkgs/development/python-modules/photutils/default.nix +++ b/pkgs/development/python-modules/photutils/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "photutils"; - version = "2.0.2"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "astropy"; repo = "photutils"; tag = version; - hash = "sha256-gXtC6O8rXBBa8VMuqxshnJieAahv3bCY2C1BXNmJxb4="; + hash = "sha256-p1MQgIYmiTekKV6oNKql/dnp5CAahXzecrTl25tz1g0="; }; build-system = [ From 6c4ad4bd6413a24f474b8377310f98a7fcfc9b7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jan 2025 09:12:20 +0100 Subject: [PATCH 71/81] python313Packages.photutils: update disabled --- pkgs/development/python-modules/photutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix index 1f22a29c9925..648fd21a2a20 100644 --- a/pkgs/development/python-modules/photutils/default.nix +++ b/pkgs/development/python-modules/photutils/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { version = "2.1.0"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "astropy"; From 4ab8bc3124f2529e7b8edef4b43affbb6b38c635 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jan 2025 09:24:34 +0100 Subject: [PATCH 72/81] ggshield: 1.34.0 -> 1.35.0 Diff: https://github.com/GitGuardian/ggshield/compare/refs/tags/v1.34.0...v1.35.0 Changelog: https://github.com/GitGuardian/ggshield/blob/1.35.0/CHANGELOG.md --- pkgs/tools/security/ggshield/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix index bbf3a63ebde7..70c65d358361 100644 --- a/pkgs/tools/security/ggshield/default.nix +++ b/pkgs/tools/security/ggshield/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ggshield"; - version = "1.34.0"; + version = "1.35.0"; pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; tag = "v${version}"; - hash = "sha256-RNQD862m1p8ooFbV8k7yDW9GzP5vPQ8hgerMpvDdXAs="; + hash = "sha256-ystZS5TYmu6Y86lGTAEXzQlV2/eowQJ+UQqLPtvwdpE="; }; pythonRelaxDeps = true; @@ -43,6 +43,7 @@ python3.pkgs.buildPythonApplication rec { ++ (with python3.pkgs; [ jsonschema pyfakefs + pytest-factoryboy pytest-mock pytest-voluptuous pytestCheckHook @@ -59,6 +60,7 @@ python3.pkgs.buildPythonApplication rec { "tests/unit/cmd/iac" "tests/unit/cmd/sca/" "tests/unit/cmd/scan/" + "tests/test_factories.py" ]; disabledTests = [ From 4c649a0d71deabbab9c0422af76bc9fedf7facb9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 31 Dec 2024 01:49:42 +0900 Subject: [PATCH 73/81] python312Packages.chainer: remove chainer has been removed, as it is abandoned and broken --- .../python-modules/chainer/default.nix | 76 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 - pkgs/top-level/release-cuda.nix | 1 - 4 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 pkgs/development/python-modules/chainer/default.nix diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix deleted file mode 100644 index b31f869244ce..000000000000 --- a/pkgs/development/python-modules/chainer/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - lib, - buildPythonPackage, - config, - cudaSupport ? config.cudaSupport, - cupy, - fetchFromGitHub, - filelock, - mock, - protobuf, - pytestCheckHook, - pythonOlder, - six, - setuptools, - numpy, - typing-extensions, -}: - -buildPythonPackage rec { - pname = "chainer"; - version = "7.8.1.post1"; - build-system = [ setuptools ]; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "chainer"; - repo = "chainer"; - tag = "v${version}"; - hash = "sha256-epwnExmyCWmwaOz+mJnAl1peEeHLBdQGC62BlLfSTQQ="; - }; - - postPatch = '' - substituteInPlace chainer/_environment_check.py \ - --replace-fail "import numpy.distutils.system_info" "import numpy" \ - --replace-fail "numpy.distutils.system_info" "numpy.__config__.get_info" - ''; - - dependencies = [ - filelock - protobuf - six - typing-extensions - numpy - ] ++ lib.optionals cudaSupport [ cupy ]; - - nativeCheckInputs = [ - mock - pytestCheckHook - ]; - - pytestFlagsArray = [ "tests/chainer_tests/utils_tests" ]; - - preCheck = '' - # cf. https://github.com/chainer/chainer/issues/8621 - export CHAINER_WARN_VERSION_MISMATCH=0 - - # ignore pytest warnings not listed - rm setup.cfg - ''; - - disabledTests = [ - "gpu" - "cupy" - "ideep" - ]; - - pythonImportsCheck = [ "chainer" ]; - - meta = { - description = "Flexible framework of neural networks for deep learning"; - homepage = "https://chainer.org/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ hyphon81 ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d6fc096ca3c2..d06c318fbb10 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -110,6 +110,7 @@ mapAliases ({ case = throw "case has been removed, since it is an unused leaf package with a dependency on the nose test framework"; # added 2024-07-08 cchardet = faust-cchardet; # added 2023-03-02 cepa = throw "cepa has been removed, as onionshare switched back to stem"; # added 2024-05-07 + chainer = throw "chainer has been removed, as it is abandoned and broken"; # added 2024-12-31 chiabip158 = throw "chiabip158 has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 chiapos = throw "chiapos has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bb340ba7b420..8eba67d3b5f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2234,10 +2234,6 @@ self: super: with self; { chai = callPackage ../development/python-modules/chai { }; - chainer = callPackage ../development/python-modules/chainer { - inherit (pkgs.config) cudaSupport; - }; - chainmap = callPackage ../development/python-modules/chainmap { }; chainstream = callPackage ../development/python-modules/chainstream { }; diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index a19bc6f8ecaa..819f694fbd11 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -121,7 +121,6 @@ let boxx = linux; bpycv = linux; catboost = linux; - chainer = linux; cupy = linux; faiss = linux; faster-whisper = linux; From 4c1d9fa92bef5b7db613522279faedaf0f64f700 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 09:11:09 +0000 Subject: [PATCH 74/81] python312Packages.google-cloud-pubsub: 2.27.1 -> 2.27.2 --- .../python-modules/google-cloud-pubsub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index c54d2bf0ee9e..ca7e688c01a7 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.27.1"; + version = "2.27.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_pubsub"; inherit version; - hash = "sha256-cRnbxa9LkV7N+hKJkZ95GkMpJ+qqe7++t0Dm1wIMGB4="; + hash = "sha256-2SwVbH3dDlElAI+XeJgZjXsa52YCYFZJcnG+xJCWR/4="; }; build-system = [ setuptools ]; From 736b92c465c099d5dd926f8441ade713b266b506 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 10 Jan 2025 12:33:30 +0300 Subject: [PATCH 75/81] maliit-framework: fix build --- pkgs/applications/misc/maliit-framework/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix index 87d388e02d29..8d14bf2bdf0e 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -4,6 +4,8 @@ fetchFromGitHub, fetchpatch, + qtbase, + at-spi2-atk, at-spi2-core, libepoxy, @@ -68,7 +70,7 @@ mkDerivation rec { ]; cmakeFlags = [ - "-DQT5_PLUGINS_INSTALL_DIR=${placeholder "out"}/$qtPluginPrefix" + "-DQT5_PLUGINS_INSTALL_DIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" ]; meta = with lib; { From e5aac1511b64086ecbdfb902bf095f7dc0c83d57 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Thu, 9 Jan 2025 00:06:18 +0100 Subject: [PATCH 76/81] magento-cloud: init at 1.46.1 --- pkgs/by-name/ma/magento-cloud/package.nix | 53 +++++++++++++++++++++++ pkgs/by-name/ma/magento-cloud/update.sh | 6 +++ 2 files changed, 59 insertions(+) create mode 100644 pkgs/by-name/ma/magento-cloud/package.nix create mode 100755 pkgs/by-name/ma/magento-cloud/update.sh diff --git a/pkgs/by-name/ma/magento-cloud/package.nix b/pkgs/by-name/ma/magento-cloud/package.nix new file mode 100644 index 000000000000..73a85f777c4c --- /dev/null +++ b/pkgs/by-name/ma/magento-cloud/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenvNoCC, + fetchurl, + makeBinaryWrapper, + php, + testers, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "magento-cloud"; + version = "1.46.1"; + + src = fetchurl { + url = "https://accounts.magento.cloud/sites/default/files/magento-cloud-v${finalAttrs.version}.phar"; + hash = "sha256-QrrD5pz6Juov1u3QYcuLr6aEKe/4DX5wFKs+hp6KjJ8="; + }; + + dontUnpack = true; + dontBuild = true; + dontConfigure = true; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -D ${finalAttrs.src} $out/libexec/magento-cloud/magento-cloud.phar + makeWrapper ${lib.getExe php} $out/bin/magento-cloud \ + --add-flags "$out/libexec/magento-cloud/magento-cloud.phar" + + runHook postInstall + ''; + + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "HOME=$TMPDIR magento-cloud --version"; + }; + }; + + meta = { + homepage = "https://experienceleague.adobe.com/en/docs/commerce-cloud-service/user-guide/dev-tools/cloud-cli/cloud-cli-overview"; + description = "Adobe Commerce Cloud CLI"; + longDescription = '' + Adobe Commerce Cloud CLI enables developers and system administrators the ability to manage Cloud projects and environments, perform routines and run automation tasks locally. + ''; + mainProgram = "magento-cloud"; + maintainers = with lib.maintainers; [ piotrkwiecinski ]; + license = lib.licenses.unfree; + }; +}) diff --git a/pkgs/by-name/ma/magento-cloud/update.sh b/pkgs/by-name/ma/magento-cloud/update.sh new file mode 100755 index 000000000000..238015c89666 --- /dev/null +++ b/pkgs/by-name/ma/magento-cloud/update.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure -i bash -p bash curl jq nix-update cacert git +set -euo pipefail + +new_version="$(curl https://accounts.magento.cloud/cli/manifest.json | jq --raw-output .[0].version)" +nix-update magento-cloud --version "$new_version" From 3441c3be20d3f9c6b64f89b4ef8a94f32acbad25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jan 2025 10:59:41 +0100 Subject: [PATCH 77/81] jwt-cli: migrate to pkgs/by-name --- .../jwt-cli/default.nix => by-name/jw/jwt-cli/package.nix} | 4 +--- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) rename pkgs/{tools/security/jwt-cli/default.nix => by-name/jw/jwt-cli/package.nix} (94%) diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/by-name/jw/jwt-cli/package.nix similarity index 94% rename from pkgs/tools/security/jwt-cli/default.nix rename to pkgs/by-name/jw/jwt-cli/package.nix index 1f84fd3dd7be..0b73b4485d27 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/by-name/jw/jwt-cli/package.nix @@ -5,7 +5,6 @@ gitUpdater, installShellFiles, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -23,8 +22,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ Security ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd jwt \ --bash <($out/bin/jwt completion bash) \ @@ -33,6 +30,7 @@ rustPlatform.buildRustPackage rec { ''; doInstallCheck = true; + installCheckPhase = '' $out/bin/jwt --version > /dev/null $out/bin/jwt decode eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3327d4a79f0b..5697afa3eac8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2399,10 +2399,6 @@ with pkgs; stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; - jwt-cli = callPackage ../tools/security/jwt-cli { - inherit (darwin.apple_sdk.frameworks) Security; - }; - kaldi = callPackage ../tools/audio/kaldi { inherit (darwin.apple_sdk.frameworks) Accelerate; }; From 18ecdf9d33779f9e56fb18ccccd86bfa8980f9cd Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 10 Jan 2025 11:01:32 +0100 Subject: [PATCH 78/81] ungoogled-chromium: 131.0.6778.204 -> 131.0.6778.264 https://chromereleases.googleblog.com/2025/01/stable-channel-update-for-desktop.html This update includes 4 security fixes. CVEs: CVE-2025-0291 --- .../networking/browsers/chromium/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 1aea581a76f5..43f33856d4ac 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -766,7 +766,7 @@ } }, "ungoogled-chromium": { - "version": "131.0.6778.204", + "version": "131.0.6778.264", "deps": { "depot_tools": { "rev": "20b9bdcace7ed561d6a75728c85373503473cb6b", @@ -777,16 +777,16 @@ "hash": "sha256-a8yCdBsl0nBMPS+pCLwrkAvQNP/THx/z/GySyOgx4Jk=" }, "ungoogled-patches": { - "rev": "131.0.6778.204-1", - "hash": "sha256-08XBobDtEuVG/tli7SXJ3Ca/aFM4kybuk043sVswPj8=" + "rev": "131.0.6778.264-1", + "hash": "sha256-u/2iKhrJRbvOtv5Yi/AfSpR7Xu4NjBTF5G03wsVGEKo=" }, "npmHash": "sha256-b1l8SwjAfoColoa3zhTMPEF/rRuxzT3ATHE77rWU5EA=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "52183f9e99a61056f9b78535f53d256f1516f2a0", - "hash": "sha256-D7+Ji8Y1vw1Sgt9njbZDGbgbzT8eAvx/95M8SsHyiN4=", + "rev": "2d05e31515360f4da764174f7c448b33e36da871", + "hash": "sha256-aAb+lMefY4+zADsVeyLIhNI4AQfGmzu+7Y8o3t2csmU=", "recompress": true }, "src/third_party/clang-format/script": { @@ -1526,8 +1526,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "7f72bbed40ca85a6b68ca2f15feca342c9c256d0", - "hash": "sha256-QJcC6T2IOCXhObwND0jPQTUl84lotcYRCIQe4GTtczc=" + "rev": "9c09e7876ff830e1f9a731aa930040d1028ff5a1", + "hash": "sha256-OKa0W4s3VfaQ/MBHkrkZ8/LeRGqjGh9hTaqet7S4o58=" } } } From 7a01f1455a98fe1277a61c297996e1572c5e6c5a Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 10 Jan 2025 19:40:18 +0900 Subject: [PATCH 79/81] python312Packages.aardwolf: 0.2.8 -> 0.2.11 Diff: https://github.com/skelsec/aardwolf/compare/0.2.8...0586591e948977ca5945252c893ba8f766ff8d28 --- .../python-modules/aardwolf/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix index c9c7c8b5bd5c..903ef62b62d2 100644 --- a/pkgs/development/python-modules/aardwolf/default.nix +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -11,61 +11,62 @@ colorama, fetchFromGitHub, iconv, - minikerberos, pillow, pyperclip, pythonOlder, rustPlatform, rustc, + setuptools, setuptools-rust, tqdm, unicrypto, - winsspi, }: buildPythonPackage rec { pname = "aardwolf"; - version = "0.2.8"; - format = "setuptools"; + version = "0.2.11"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "skelsec"; repo = "aardwolf"; - tag = version; - hash = "sha256-4kJsW0uwWfcgVruEdDw3QhbzfPDuLjmK+YvcLrgF4SI="; + rev = "0586591e948977ca5945252c893ba8f766ff8d28"; + hash = "sha256-daDxkQ7N0+yS2JOLfXJq4jv+5VQNnwtqIMy2p8j+Sag="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/aardwolf/utils/rlers"; name = "${pname}-${version}"; - hash = "sha256-i7fmdWOseRQGdvdBnlGi+lgWvhC2WFI2FwXU9JywYsc="; + hash = "sha256-dGWPgyg8Ibyz3KcrMUI7xL7gTJ7iZ4sN0zOxFxcIrhM="; }; cargoRoot = "aardwolf/utils/rlers"; + build-system = [ + setuptools + setuptools-rust + ]; + nativeBuildInputs = [ rustPlatform.cargoSetupHook - setuptools-rust cargo rustc ]; - propagatedBuildInputs = [ + dependencies = [ arc4 asn1crypto asn1tools asyauth asysocks colorama - minikerberos pillow pyperclip tqdm unicrypto - winsspi ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ iconv ]; # Module doesn't have tests From da4d290cd485c087c878d2ea5e99fb09e20aaa06 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 10 Jan 2025 11:48:17 +0100 Subject: [PATCH 80/81] tinymist: 0.12.16 -> 0.12.18 Diff: https://github.com/Myriad-Dreamin/tinymist/compare/refs/tags/v0.12.16...v0.12.18 Changelog: https://github.com/Myriad-Dreamin/tinymist/blob/v0.12.18/CHANGELOG.md --- .../vscode/extensions/myriad-dreamin.tinymist/default.nix | 2 +- pkgs/by-name/ti/tinymist/package.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index a8aa75ababa3..89d96d7fba02 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-8QwUZfR0eTjXE6IgjpYx9TcWf8WrrVWA0VfTUX+WVCc="; + hash = "sha256-86P0PsOyLtHfGE4HaTvH0nSVs3IialAmw+gyajfJrRE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 88d407b868b1..f9d4b21e9201 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -18,17 +18,17 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.12.16"; + version = "0.12.18"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; tag = "v${version}"; - hash = "sha256-DwekAk1LkpK/48yzKc6Ry5GZ3oR/uH7+xpvT0LlSF00="; + hash = "sha256-/QalLr4kerOe+KooKY+Vq6FaGJyzGvaUHhUSu+LTphA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LlZD/amKO/4dOo6xB5kz51igTDrkHbVQDquRpkMujVU="; + cargoHash = "sha256-D4UWFg22lnkqozsWAQydNSnOpDlw5AUhGCHHfuyihfU="; nativeBuildInputs = [ installShellFiles From dd11ed78c3f3d872324376aa0d95a08c37f849f9 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Thu, 3 Oct 2024 23:31:47 +0200 Subject: [PATCH 81/81] pythonPackages.color-operations: 0.1.4 -> 0.1.6 --- pkgs/development/python-modules/color-operations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/color-operations/default.nix b/pkgs/development/python-modules/color-operations/default.nix index faca0ad788eb..c664281eba04 100644 --- a/pkgs/development/python-modules/color-operations/default.nix +++ b/pkgs/development/python-modules/color-operations/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "color-operations"; - version = "0.1.4"; + version = "0.1.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "vincentsarago"; repo = "color-operations"; tag = version; - hash = "sha256-qqOTmVYD3VfjeVJtYvDQw+cxjcTsmqTYQNL1qMX+fL4="; + hash = "sha256-hHfcScKYemvPg2V5wn1Wsctjg6vgzljk5sAw+I+kS6w="; }; build-system = [