From 79a85d3ce548122577aaf9f779e07ec4cba6faca Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 19 Apr 2023 19:08:07 -0400 Subject: [PATCH 01/43] neovim: bundle treesitter parsers --- pkgs/applications/editors/neovim/default.nix | 15 +++++- .../editors/neovim/treesitter-parsers.nix | 24 ++++++++++ .../neovim/update-treesitter-parsers.py | 46 +++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/editors/neovim/treesitter-parsers.nix create mode 100755 pkgs/applications/editors/neovim/update-treesitter-parsers.py diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index fb850c7ca366..7d735421b07a 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -4,6 +4,8 @@ , unibilium, gperf , libvterm-neovim , tree-sitter +, fetchurl +, treesitter-parsers ? import ./treesitter-parsers.nix { inherit fetchurl; } , CoreServices , glibcLocales ? null, procps ? null @@ -119,7 +121,18 @@ in ) '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" - ''; + '' + '' + mkdir -p $out/lib/nvim/parser + '' + lib.concatStrings (lib.mapAttrsToList + (language: src: '' + ln -s \ + ${tree-sitter.buildGrammar { + inherit language src; + version = "neovim-${version}"; + }}/parser \ + $out/lib/nvim/parser/${language}.so + '') + treesitter-parsers); shellHook='' export VIMRUNTIME=$PWD/runtime diff --git a/pkgs/applications/editors/neovim/treesitter-parsers.nix b/pkgs/applications/editors/neovim/treesitter-parsers.nix new file mode 100644 index 000000000000..d36f8bda8542 --- /dev/null +++ b/pkgs/applications/editors/neovim/treesitter-parsers.nix @@ -0,0 +1,24 @@ +{ fetchurl }: + +{ + c = fetchurl { + url = "https://github.com/tree-sitter/tree-sitter-c/archive/v0.20.2.tar.gz"; + hash = "sha256:af66fde03feb0df4faf03750102a0d265b007e5d957057b6b293c13116a70af2"; + }; + lua = fetchurl { + url = "https://github.com/MunifTanjim/tree-sitter-lua/archive/v0.0.14.tar.gz"; + hash = "sha256:930d0370dc15b66389869355c8e14305b9ba7aafd36edbfdb468c8023395016d"; + }; + vim = fetchurl { + url = "https://github.com/neovim/tree-sitter-vim/archive/v0.3.0.tar.gz"; + hash = "sha256:403acec3efb7cdb18ff3d68640fc823502a4ffcdfbb71cec3f98aa786c21cbe2"; + }; + vimdoc = fetchurl { + url = "https://github.com/neovim/tree-sitter-vimdoc/archive/v2.0.0.tar.gz"; + hash = "sha256:1ff8f4afd3a9599dd4c3ce87c155660b078c1229704d1a254433e33794b8f274"; + }; + query = fetchurl { + url = "https://github.com/nvim-treesitter/tree-sitter-query/archive/v0.1.0.tar.gz"; + hash = "sha256:e2b806f80e8bf1c4f4e5a96248393fe6622fc1fc6189d6896d269658f67f914c"; + }; +} diff --git a/pkgs/applications/editors/neovim/update-treesitter-parsers.py b/pkgs/applications/editors/neovim/update-treesitter-parsers.py new file mode 100755 index 000000000000..27260ca64917 --- /dev/null +++ b/pkgs/applications/editors/neovim/update-treesitter-parsers.py @@ -0,0 +1,46 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p python3 + +import re +import subprocess +from pathlib import Path + +parsers = {} +dir = Path(__file__).parent +regex = re.compile(r"^set\(TREESITTER_([A-Z_]+)_(URL|SHA256)\s+([^ \)]+)\s*\)\s*$") + +src = subprocess.check_output( + [ + "nix-build", + dir.parent.parent.parent.parent, + "-A", + "neovim-unwrapped.src", + "--no-out-link", + ], + text=True, +).strip() + +for line in open(f"{src}/cmake.deps/CMakeLists.txt"): + m = regex.fullmatch(line) + if m is None: + continue + + lang = m[1].lower() + ty = m[2] + val = m[3] + + if not lang in parsers: + parsers[lang] = {} + parsers[lang][ty] = val + +with open(dir / "treesitter-parsers.nix", "w") as f: + f.write("{ fetchurl }:\n\n{\n") + for lang, src in parsers.items(): + f.write( + f""" {lang} = fetchurl {{ + url = "{src["URL"]}"; + hash = "sha256:{src["SHA256"]}"; + }}; +""" + ) + f.write("}\n") From 367b30e1989bd70f24c67c670d5e7b47ae3b2898 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Apr 2023 11:10:36 +0200 Subject: [PATCH 02/43] python310Packages.openapi-core: 0.17.0 -> 0.17.1 Diff: https://github.com/p1c2u/openapi-core/compare/refs/tags/0.17.0...0.17.1 --- pkgs/development/python-modules/openapi-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index e024138b4cfb..b5b2df878623 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.17.0"; + version = "0.17.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-LxCaP8r+89UmV/VfqtA/mWV/CXd6ZfRQnNnM0Jde7ko="; + hash = "sha256-xlrG2FF55qDsrkdSqCBLu3/QLtZs48ZUB90B2CemY64="; }; postPatch = '' From 4fb1ee07ffbfe37f2021f86dc1a668e0d58bed0a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Apr 2023 11:10:58 +0200 Subject: [PATCH 03/43] python310Packages.openapi-schema-validator: 0.4.3 -> 0.4.4 Diff: https://github.com/p1c2u/openapi-schema-validator/compare/refs/tags/0.4.3...0.4.4 --- .../python-modules/openapi-schema-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index 456f57e3309d..19b3e9cc3e74 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "openapi-schema-validator"; - version = "0.4.3"; + version = "0.4.4"; format = "pyproject"; src = fetchFromGitHub { owner = "p1c2u"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rp0Oq5WWPpna5rHrq/lfRNxjK5/FLgPZ5uzVfDT/YiI="; + hash = "sha256-2XTCdp9dfzhNKCpq71pt7yEZm9abiEmFHD/114W+jOQ="; }; postPatch = '' From 23c75c674d0246beb4a86cd03494f5b94483eb8a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Apr 2023 11:11:19 +0200 Subject: [PATCH 04/43] python310Packages.openapi-spec-validator: 0.5.5 -> 0.5.6 Diff: https://github.com/p1c2u/openapi-spec-validator/compare/refs/tags/0.5.5...0.5.6 Changelog: https://github.com/p1c2u/openapi-spec-validator/releases/tag/0.5.6 --- .../python-modules/openapi-spec-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 4624bdaae471..5bcbca949fd1 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.5.5"; + version = "0.5.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-t7u0p6V2woqIFsqywv7k5s5pbbnmcn45YnlFWH1PEi4="; + hash = "sha256-BIGHaZhrEc7wcIesBIXdVRzozllCNOz67V+LmQfZ8oY="; }; nativeBuildInputs = [ From 39bcf885917b131f08cc385b91e9f52e6b46db8a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Mar 2023 09:46:38 +0100 Subject: [PATCH 05/43] python310Packages.fsspec: 2022.10.0 -> 2023.1.0 Changelog: https://github.com/fsspec/filesystem_spec/raw/2023.1.0/docs/source/changelog.rst --- pkgs/development/python-modules/fsspec/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 37adb4c8b533..68e342c21949 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -13,8 +13,6 @@ , requests , smbprotocol , tqdm - -# optionals , adlfs , dask , distributed @@ -31,7 +29,7 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2022.10.0"; + version = "2023.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -40,7 +38,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = "filesystem_spec"; rev = version; - hash = "sha256-+lPt/zqI3Mkt+QRNXq+Dxm3h/ryZJsfrmayVi/BTtbg="; + hash = "sha256-SvqIgHFka/xTgFCoBnDPiL4tvwzA8LbvDvXPxW3IGvI="; }; propagatedBuildInputs = [ @@ -137,6 +135,9 @@ buildPythonPackage rec { # test accesses this remote ftp server: # https://ftp.fau.de/debian-cd/current/amd64/log/success "test_find" + # Tests want to access S3 + "test_urlpath_inference_errors" + "test_mismatch" ] ++ lib.optionals (stdenv.isDarwin) [ # works locally on APFS, fails on hydra with AssertionError comparing timestamps # darwin hydra builder uses HFS+ and has only one second timestamp resolution From 8643ea7e10204d2817048ce21a4107ce458cf271 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Mar 2023 09:48:48 +0100 Subject: [PATCH 06/43] python310Packages.gcsfs: 2022.10.0 -> 2023.1.0 Changelog: https://github.com/fsspec/gcsfs/raw/2023.1.0/docs/source/changelog.rst --- pkgs/development/python-modules/gcsfs/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index 3c0ad627b00a..284f1407272b 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -12,13 +12,14 @@ , ujson , aiohttp , crcmod +, pytest-timeout , pytest-vcr , vcrpy }: buildPythonPackage rec { pname = "gcsfs"; - version = "2022.10.0"; + version = "2023.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fsspec"; repo = pname; - rev = version; - hash = "sha256-+S4AziibYWos/hZ1v3883b1Vv3y4xjIDUrQ8c2XJ1MQ="; + rev = "refs/tags/${version}"; + hash = "sha256-HkpK7Dbp9myKtl/kWnFi0CmrM5PnuOKriTBeHg1Zd5c="; }; propagatedBuildInputs = [ @@ -44,6 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-vcr + pytest-timeout pytestCheckHook vcrpy ]; From 085b06f4aa23b1cfb829eed35ff95c65f06cc729 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Apr 2023 08:29:36 +0200 Subject: [PATCH 07/43] python310Packages.ossfs: 2023.1.0 -> 2023.3.0 Changelog: https://github.com/fsspec/ossfs/releases/tag/2023.3.0 --- pkgs/development/python-modules/ossfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix index f78ed6dd5adf..f149920afb7a 100644 --- a/pkgs/development/python-modules/ossfs/default.nix +++ b/pkgs/development/python-modules/ossfs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ossfs"; - version = "2023.1.0"; + version = "2023.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5mz1OC+6kDpiLNsMwOp+bdqY2eozMpAekS6h34QiOdo="; + hash = "sha256-E+SVH4MUTHHhvopEydiPKTmzazHm6mzjEWd2zp4XGvs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From ac22ea44ff4cc67521facb39e4f7cd5451d07fda Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 May 2023 09:27:58 +0200 Subject: [PATCH 08/43] python310Packages.fsspec: 2023.1.0 -> 2023.4.0 Diff: https://github.com/fsspec/filesystem_spec/compare/2023.1.0...2023.4.0 Changelog: https://github.com/fsspec/filesystem_spec/raw/2023.4.0/docs/source/changelog.rst --- pkgs/development/python-modules/fsspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 68e342c21949..970f04be62eb 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2023.1.0"; + version = "2023.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = "filesystem_spec"; rev = version; - hash = "sha256-SvqIgHFka/xTgFCoBnDPiL4tvwzA8LbvDvXPxW3IGvI="; + hash = "sha256-qkvhmXJNxA8v+kbZ6ulxJAQr7ReQpb+JkbhOUnL59KM="; }; propagatedBuildInputs = [ From 0a197a4a1e471ec5d3ed8b6a3b49a372e8a33ec9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 May 2023 09:28:29 +0200 Subject: [PATCH 09/43] python310Packages.gcsfs: 2023.1.0 -> 2023.4.0 Diff: https://github.com/fsspec/gcsfs/compare/refs/tags/2023.1.0...2023.4.0 Changelog: https://github.com/fsspec/gcsfs/raw/2023.4.0/docs/source/changelog.rst --- pkgs/development/python-modules/gcsfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index 284f1407272b..04af8e58ef79 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2023.1.0"; + version = "2023.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-HkpK7Dbp9myKtl/kWnFi0CmrM5PnuOKriTBeHg1Zd5c="; + hash = "sha256-FHS+g0SuYH9OPiE/+p2SHrsWfzBQ82GM6hTph8koh+o="; }; propagatedBuildInputs = [ From 2fb1be6b1e1d16b77432ef4c8403fa9090934233 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 May 2023 09:58:06 +0200 Subject: [PATCH 10/43] python310Packages.aiooss2: init at 0.2.5 --- .../python-modules/aiooss2/default.nix | 74 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/development/python-modules/aiooss2/default.nix diff --git a/pkgs/development/python-modules/aiooss2/default.nix b/pkgs/development/python-modules/aiooss2/default.nix new file mode 100644 index 000000000000..e1f5758377e1 --- /dev/null +++ b/pkgs/development/python-modules/aiooss2/default.nix @@ -0,0 +1,74 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, oss2 +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, requests +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "aiooss2"; + version = "0.2.5"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "karajan1001"; + repo = "aiooss2"; + rev = "refs/tags/${version}"; + hash = "sha256-NYr8i5OAYRaRnDkNmnw1IWXnSp7HAovNaSV79xcwyHo="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + pythonRelaxDeps = [ + "aiohttp" + "oss2" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + aiohttp + oss2 + ]; + + nativeCheckInputs = [ + pytest-mock + pytest-asyncio + pytestCheckHook + requests + ]; + + pythonImportsCheck = [ + "aiooss2" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/func/test_bucket.py" + "tests/func/test_object.py" + "tests/func/test_resumable.py" + "tests/unit/test_adapter.py" + ]; + + meta = with lib; { + description = "Library for aliyun OSS (Object Storage Service)"; + homepage = "https://github.com/karajan1001/aiooss2"; + changelog = "https://github.com/karajan1001/aiooss2/blob/${version}/CHANGES.txt"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d7bc0412d94..cd53c300c42a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -284,6 +284,8 @@ self: super: with self; { aioopenssl = callPackage ../development/python-modules/aioopenssl { }; + aiooss2 = callPackage ../development/python-modules/aiooss2 { }; + aiopg = callPackage ../development/python-modules/aiopg { }; aioprocessing = callPackage ../development/python-modules/aioprocessing { }; From 3fa9a5467ac7e734b3244aa0594961e1e68c208b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 May 2023 10:31:37 +0200 Subject: [PATCH 11/43] python310Packages.tifffile: 20232.2.3 -> 2023.4.12 Changelog: https://github.com/cgohlke/tifffile/blob/v2023.4.12/CHANGES.rst --- pkgs/development/python-modules/tifffile/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 343d1b5b0185..c3a56f5c64ca 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2023.2.3"; + version = "2023.4.12"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-RY31rZpSF/Zo7dY23Bn7xzYGK/eKrII6uEzbrp3o6qY="; + hash = "sha256-L6mfmJDKq5GdkyoKyqnQ9YQ9wu81lOISljky4gcTut0="; }; propagatedBuildInputs = [ @@ -47,6 +47,8 @@ buildPythonPackage rec { "test_write_imagej_raw" # https://github.com/cgohlke/tifffile/issues/142 "test_func_bitorder_decode" + # Test file is missing + "test_issue_invalid_predictor" ]; pythonImportsCheck = [ From 02f05bbf9207253b26737a9f175b6a496a018265 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 May 2023 11:45:38 +0200 Subject: [PATCH 12/43] python310Packages.ossfs: 2023.1.0 -> 2023.4.0 Diff: fsspec/ossfs@refs/tags/2023.1.0...2023.4.0 Changelog: https://github.com/fsspec/ossfs/releases/tag/2023.4.0 --- pkgs/development/python-modules/ossfs/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix index f149920afb7a..d43d6663c48f 100644 --- a/pkgs/development/python-modules/ossfs/default.nix +++ b/pkgs/development/python-modules/ossfs/default.nix @@ -1,16 +1,17 @@ { lib +, aiooss2 , buildPythonPackage , fetchFromGitHub , fsspec , oss2 , pythonOlder -, setuptools-scm , pythonRelaxDepsHook +, setuptools-scm }: buildPythonPackage rec { pname = "ossfs"; - version = "2023.3.0"; + version = "2023.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,12 +20,13 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-E+SVH4MUTHHhvopEydiPKTmzazHm6mzjEWd2zp4XGvs="; + hash = "sha256-xYxoEU4+XyiEZThLEyRVHNFg7Bc6jrYEEtq8o+4PtnY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; pythonRelaxDeps = [ + "aiooss2" "fsspec" "oss2" ]; @@ -35,6 +37,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + aiooss2 fsspec oss2 ]; From 96a3364aa01e7ac051fb21aff91a9c43f9a1ab26 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 May 2023 11:47:07 +0200 Subject: [PATCH 13/43] python310Packages.oss2: 2.16.0 -> 2.17.0 Changelog: https://github.com/aliyun/aliyun-oss-python-sdk/releases/tag/2.17.0 --- pkgs/development/python-modules/oss2/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/oss2/default.nix b/pkgs/development/python-modules/oss2/default.nix index e7f2856771a3..54427f03897c 100644 --- a/pkgs/development/python-modules/oss2/default.nix +++ b/pkgs/development/python-modules/oss2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "oss2"; - version = "2.16.0"; + version = "2.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-oss-python-sdk"; - rev = version; - hash = "sha256-Q8U7zMlqpKSoW99MBm9p0AnrGZY7M9oRNImMNJaEjSw="; + rev = "refs/tags/${version}"; + hash = "sha256-EL6qbtVyOJ2RGw3sZiRJouqVNLBMUKGycAZl31M1+oQ="; }; nativeBuildInputs = [ @@ -57,10 +57,13 @@ buildPythonPackage rec { # Tests require network access "tests/test_api_base.py" "tests/test_async_fetch_task.py" + "tests/test_bucket_access_monitor.py" "tests/test_bucket_cname.py" "tests/test_bucket_inventory.py" "tests/test_bucket_meta_query.py" "tests/test_bucket_replication.py" + "tests/test_bucket_resource_group.py" + "tests/test_bucket_style.py" "tests/test_bucket_transfer_acceleration.py" "tests/test_bucket_versioning.py" "tests/test_bucket_worm.py" @@ -105,6 +108,7 @@ buildPythonPackage rec { meta = with lib; { description = "Alibaba Cloud OSS SDK for Python"; homepage = "https://github.com/aliyun/aliyun-oss-python-sdk"; + changelog = "https://github.com/aliyun/aliyun-oss-python-sdk/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 9013eeea6328a7b97a8122842a7694179241c1af Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 1 May 2023 19:54:24 +0200 Subject: [PATCH 14/43] zigbee2mqtt: 1.30.3 -> 1.30.4 https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.30.4 --- pkgs/servers/zigbee2mqtt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 5c430080f1c1..882f78948e41 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.30.3"; + version = "1.30.4"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-kAdyuJl9UY5E5+8nNj2f1mdH+/f/V66JloAngEaQcsU="; + hash = "sha256-jS5O52frZY+OVLtMZkjZQskKuHs5T8zKTwjGKh77EAo="; }; - npmDepsHash = "sha256-V9wyEdoi6JnaIKNp7OWwBTHNcLY2qg0juDJG/MKn5X8="; + npmDepsHash = "sha256-71BbMBt0vXsuL8senZ7IvT3Y3OtvewQtWk1bzKUBtjI="; nativeBuildInputs = [ python3 From 784e0fcc128a41bbadb68f6216466c887c9615fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 1 May 2023 14:57:23 -0600 Subject: [PATCH 15/43] linux: 5.15.109 -> 5.15.110 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 61497c74fd00..64f8c167cc6c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.109"; + version = "5.15.110"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "06kpqpmbp4gpsx1yqcznmbn41wq82wmza0p3l9l00j1wpsy4nv06"; + sha256 = "0nqbhgafl513pdfn55j608829bsw8kn0v616gblxqy4rgg3zqacq"; }; } // (args.argsOverride or { })) From b94146bbe4a657fbcba1387501266a888dd6260b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 1 May 2023 14:57:35 -0600 Subject: [PATCH 16/43] linux: 6.1.26 -> 6.1.27 --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index 002d2eadff20..9b9c772b6435 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.26"; + version = "6.1.27"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0461ckgh9qm1pj9xyi61cvawqpavn2sb44wjx5g4mmkrm11w3p6z"; + sha256 = "01grx5y48scyyihpj176knn5yvgpxv2gfkli03rwj31xvnb4pdy2"; }; # TODO: possible to remove after any rebuild, e.g. after update. extraConfig = lib.optionalString (buildPackages.stdenv.system == "x86_64-linux") "\n"; From 48d8cfdd368ac52c3ed15144853353338a898680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 1 May 2023 14:57:48 -0600 Subject: [PATCH 17/43] linux: 6.2.13 -> 6.2.14 --- pkgs/os-specific/linux/kernel/linux-6.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.2.nix b/pkgs/os-specific/linux/kernel/linux-6.2.nix index 68aa7e9aecf0..2756beace079 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.2.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.2.13"; + version = "6.2.14"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0xz507nzslgidq7pwnfnsawvrn30apv4mmiapcc4p0v8wcafvpf7"; + sha256 = "0ab756x6baza5wmi0r836g7z0hkvby65g0k6n1sd95nl16irzg0f"; }; } // (args.argsOverride or { })) From 30974ae135996ba882e0733a93c58d1ff05fd51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 1 May 2023 14:58:01 -0600 Subject: [PATCH 18/43] linux: 6.3 -> 6.3.1 --- pkgs/os-specific/linux/kernel/linux-6.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.3.nix b/pkgs/os-specific/linux/kernel/linux-6.3.nix index 4cd9acab66b4..4df0241a9d8d 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.3.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.3"; + version = "6.3.1"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "sha256-ujSR9e1r0nCjcMRAQ049aQhfzdUoki+gHnPXZX23Ox4="; + sha256 = "0aizkgwdmdjrgab67yjfaqcmvfh7wb3b3mdq9qfxpq6mlys0yqkq"; }; } // (args.argsOverride or { })) From 4c75d44b8995cbdc8d80d7633fea1e83e2a9c9b5 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 2 May 2023 12:27:48 +0200 Subject: [PATCH 19/43] noto-fonts: 23.4.1 -> 23.5.1 --- pkgs/data/fonts/noto-fonts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 822bde41abe3..ac29a5956127 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -34,13 +34,13 @@ rec { }: stdenvNoCC.mkDerivation rec { inherit pname; - version = "23.4.1"; + version = "23.5.1"; src = fetchFromGitHub { owner = "notofonts"; repo = "notofonts.github.io"; rev = "noto-monthly-release-${version}"; - hash = "sha256-hiBbhcwktacuoYJnZcsh7Aej5QIrBNkqrel2NhjNjCU="; + hash = "sha256-tIzn9xBDVFT7h9+p2NltA0v0mvB1OH9rX9+eXvIPhv0="; }; _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants; From 74c04fe25b1c8f5375f52f9c153516a40434fef6 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 2 May 2023 13:17:37 +0200 Subject: [PATCH 20/43] noto-fonts: add passthru.updateScript --- pkgs/data/fonts/noto-fonts/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index ac29a5956127..d0ac56cd5d39 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -1,6 +1,7 @@ { stdenv , stdenvNoCC , lib +, gitUpdater , fetchFromGitHub , fetchurl , cairo @@ -74,6 +75,10 @@ rec { done ''); + passthru.updateScript = gitUpdater { + rev-prefix = "noto-monthly-release-"; + }; + meta = with lib; { description = "Beautiful and free fonts for many languages"; homepage = "https://www.google.com/get/noto/"; From 6bee96400927140b10db3729feff32f238fa777d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 May 2023 15:11:06 +0200 Subject: [PATCH 21/43] python310Packages.asyncstdlib: 3.10.6 -> 3.10.7 Diff: https://github.com/maxfischer2781/asyncstdlib/compare/refs/tags/v3.10.6...v3.10.7 Changelog: https://github.com/maxfischer2781/asyncstdlib/releases/tag/v3.10.7 --- pkgs/development/python-modules/asyncstdlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index 72c7293a117b..b0391c385b37 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.10.6"; + version = "3.10.7"; format = "flit"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JfKcmmusFmMckYc2+EBItt5V6o4Dk+foIv5hb7wMsHs="; + hash = "sha256-lX5mOcoZTb6EfRHT0qTTWst3NErLti4jZwAeQx4pHGA="; }; propagatedBuildInputs = [ From 8372789e47ceb405fbf7e1b44c878df7575b9e19 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 2 May 2023 16:30:00 +0200 Subject: [PATCH 22/43] qgroundcontrol: 4.2.4 -> 4.2.6 Diff: https://github.com/mavlink/qgroundcontrol/compare/v4.2.4...v4.2.6 --- .../robotics/qgroundcontrol/default.nix | 23 +++---- .../robotics/qgroundcontrol/fix-10132.patch | 62 ------------------- 2 files changed, 8 insertions(+), 77 deletions(-) delete mode 100644 pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 7942c2b41b4f..385944bc5be9 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,12 +1,10 @@ -{ lib, mkDerivation, fetchFromGitHub, SDL2 -, qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2 -, qtgraphicaleffects, qtspeech, qtx11extras, qmake, qttools -, gst_all_1, wayland, pkg-config -}: +{ lib, stdenv, fetchFromGitHub, SDL2, qtbase, qtcharts, qtlocation, qtserialport +, qtsvg, qtquickcontrols2, qtgraphicaleffects, qtspeech, qtx11extras, qmake +, qttools, gst_all_1, wayland, pkg-config, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qgroundcontrol"; - version = "4.2.4"; + version = "4.2.6"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -23,7 +21,7 @@ mkDerivation rec { ]; buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs; - nativeBuildInputs = [ pkg-config qmake qttools ]; + nativeBuildInputs = [ pkg-config qmake qttools wrapQtAppsHook ]; preConfigure = '' mkdir build @@ -69,21 +67,16 @@ mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pPxqYxBlw9re1rlUU2qz0gFRmT+PmslrcBv97VEG84k="; + sha256 = "sha256-mMeKDfylVEqLo1i2ucUBu287Og4472Ecp7Cge9Cw3kE="; fetchSubmodules = true; }; - patches = [ - # fix build problems caused by https://github.com/mavlink/qgroundcontrol/pull/10132 - # remove once updated past 4.2.0 - ./fix-10132.patch - ]; - meta = with lib; { description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; homepage = "http://qgroundcontrol.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ lopsided98 ]; + mainProgram = "QGroundControl"; }; } diff --git a/pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch b/pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch deleted file mode 100644 index 0a666132f931..000000000000 --- a/pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc -index 2b314e0..ad1425e 100644 ---- a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc -+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc -@@ -35,7 +35,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); - - GstQSGTexture::GstQSGTexture () - { -- static volatile gsize _debug; -+ static gsize _debug; - - initializeOpenGLFunctions(); - -diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc -index 3a68576..5203d13 100644 ---- a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc -+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc -@@ -58,7 +58,7 @@ gst_qt_get_gl_display () - { - GstGLDisplay *display = NULL; - QGuiApplication *app = static_cast (QCoreApplication::instance ()); -- static volatile gsize _debug; -+ static gsize _debug; - - g_assert (app != NULL); - -diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc -index f031b36..3c6722a 100644 ---- a/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc -+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc -@@ -106,7 +106,7 @@ void InitializeSceneGraph::run() - - QtGLVideoItem::QtGLVideoItem() - { -- static volatile gsize _debug; -+ static gsize _debug; - - if (g_once_init_enter (&_debug)) { - GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget"); -diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc -index 8bf14ae..2f88aa9 100644 ---- a/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc -+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc -@@ -107,7 +107,7 @@ QtGLWindow::QtGLWindow ( QWindow * parent, QQuickWindow *src ) : - QQuickWindow( parent ), source (src) - { - QGuiApplication *app = static_cast (QCoreApplication::instance ()); -- static volatile gsize _debug; -+ static gsize _debug; - - g_assert (app != NULL); - -@@ -156,7 +156,7 @@ QtGLWindow::beforeRendering() - - g_mutex_lock (&this->priv->lock); - -- static volatile gsize once = 0; -+ static gsize once = 0; - if (g_once_init_enter(&once)) { - this->priv->start = QDateTime::currentDateTime().toMSecsSinceEpoch(); - g_once_init_leave(&once,1); - From 24a641fa2823b813a947694ee5392dff185a9f30 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 2 May 2023 11:29:35 -0400 Subject: [PATCH 23/43] ruff: 0.0.263 -> 0.0.264 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.263...v0.0.264 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.264 --- pkgs/development/tools/ruff/Cargo.lock | 56 +++++++++++++------------ pkgs/development/tools/ruff/default.nix | 6 +-- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 6b87f9ec4f3e..7613d1b37225 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -129,6 +129,15 @@ version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +[[package]] +name = "argfile" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "265f5108974489a217d5098cd81666b60480c8dd67302acbbe7cbdd8aa09d638" +dependencies = [ + "os_str_bytes", +] + [[package]] name = "ascii" version = "1.1.0" @@ -832,7 +841,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flake8-to-ruff" -version = "0.0.263" +version = "0.0.264" dependencies = [ "anyhow", "clap 4.2.4", @@ -1503,6 +1512,9 @@ name = "os_str_bytes" version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" +dependencies = [ + "memchr", +] [[package]] name = "output_vt100" @@ -1992,7 +2004,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.0.263" +version = "0.0.264" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -2081,10 +2093,11 @@ dependencies = [ [[package]] name = "ruff_cli" -version = "0.0.263" +version = "0.0.264" dependencies = [ "annotate-snippets 0.9.1", "anyhow", + "argfile", "assert_cmd", "atty", "bincode", @@ -2110,6 +2123,7 @@ dependencies = [ "ruff_diagnostics", "ruff_python_ast", "ruff_python_stdlib", + "ruff_text_size", "rustc-hash", "serde", "serde_json", @@ -2152,8 +2166,7 @@ version = "0.0.0" dependencies = [ "anyhow", "log", - "ruff_python_ast", - "rustpython-parser", + "ruff_text_size", "serde", ] @@ -2191,6 +2204,7 @@ dependencies = [ "is-macro", "itertools", "log", + "memchr", "num-bigint", "num-traits", "once_cell", @@ -2235,6 +2249,7 @@ dependencies = [ "nohash-hasher", "ruff_python_ast", "ruff_python_stdlib", + "ruff_text_size", "rustc-hash", "rustpython-parser", "smallvec", @@ -2271,11 +2286,10 @@ dependencies = [ [[package]] name = "ruff_text_size" version = "0.0.0" +source = "git+https://github.com/charliermarsh/RustPython.git?rev=c3147d2c1524ebd0e90cf1c2938d770314fd5a5a#c3147d2c1524ebd0e90cf1c2938d770314fd5a5a" dependencies = [ "schemars", "serde", - "serde_test", - "static_assertions", ] [[package]] @@ -2343,27 +2357,28 @@ dependencies = [ [[package]] name = "rustpython-ast" version = "0.2.0" -source = "git+https://github.com/RustPython/RustPython.git?rev=c15f670f2c30cfae6b41a1874893590148c74bc4#c15f670f2c30cfae6b41a1874893590148c74bc4" +source = "git+https://github.com/charliermarsh/RustPython.git?rev=c3147d2c1524ebd0e90cf1c2938d770314fd5a5a#c3147d2c1524ebd0e90cf1c2938d770314fd5a5a" dependencies = [ "num-bigint", - "rustpython-compiler-core", + "ruff_text_size", ] [[package]] name = "rustpython-common" version = "0.2.0" -source = "git+https://github.com/RustPython/RustPython.git?rev=c15f670f2c30cfae6b41a1874893590148c74bc4#c15f670f2c30cfae6b41a1874893590148c74bc4" +source = "git+https://github.com/charliermarsh/RustPython.git?rev=c3147d2c1524ebd0e90cf1c2938d770314fd5a5a#c3147d2c1524ebd0e90cf1c2938d770314fd5a5a" dependencies = [ "ascii", "bitflags 1.3.2", + "bstr 0.2.17", "cfg-if", + "getrandom", "hexf-parse", "itertools", "lexical-parse-float", "libc", "lock_api", "num-bigint", - "num-complex", "num-traits", "once_cell", "radium", @@ -2377,23 +2392,21 @@ dependencies = [ [[package]] name = "rustpython-compiler-core" version = "0.2.0" -source = "git+https://github.com/RustPython/RustPython.git?rev=c15f670f2c30cfae6b41a1874893590148c74bc4#c15f670f2c30cfae6b41a1874893590148c74bc4" +source = "git+https://github.com/charliermarsh/RustPython.git?rev=c3147d2c1524ebd0e90cf1c2938d770314fd5a5a#c3147d2c1524ebd0e90cf1c2938d770314fd5a5a" dependencies = [ "bitflags 1.3.2", - "bstr 0.2.17", "itertools", "lz4_flex", "num-bigint", "num-complex", - "serde", + "ruff_text_size", ] [[package]] name = "rustpython-parser" version = "0.2.0" -source = "git+https://github.com/RustPython/RustPython.git?rev=c15f670f2c30cfae6b41a1874893590148c74bc4#c15f670f2c30cfae6b41a1874893590148c74bc4" +source = "git+https://github.com/charliermarsh/RustPython.git?rev=c3147d2c1524ebd0e90cf1c2938d770314fd5a5a#c3147d2c1524ebd0e90cf1c2938d770314fd5a5a" dependencies = [ - "ahash", "anyhow", "itertools", "lalrpop", @@ -2403,10 +2416,10 @@ dependencies = [ "num-traits", "phf", "phf_codegen", + "ruff_text_size", "rustc-hash", "rustpython-ast", "rustpython-compiler-core", - "serde", "tiny-keccak", "unic-emoji-char", "unic-ucd-ident", @@ -2555,15 +2568,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_test" -version = "1.0.160" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c95a500e3923258f7fc3a16bf29934e403aef5ca1096e184d85e3b1926675e8" -dependencies = [ - "serde", -] - [[package]] name = "shellexpand" version = "3.1.0" diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index eeb971918ebd..356304f25d52 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.263"; + version = "0.0.264"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - hash = "sha256-EhxevilIrcrM7wcuF39b4P4T8OpNwdyga+wAPatil8Q="; + hash = "sha256-MDNqoKsXKSM5l351bMs4Z5Voig+HwR2907xlHDFB6x4="; }; # We have to use importCargoLock here because `cargo vendor` currently doesn't support workspace @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "libcst-0.1.0" = "sha256-jG9jYJP4reACkFLrQBWOYH6nbKniNyFVItD0cTZ+nW0="; - "rustpython-ast-0.2.0" = "sha256-0SHtycgDVOtiz7JZwd1v9lv2exxemcntm9lciih+pgc="; + "ruff_text_size-0.0.0" = "sha256-+pAsfjJfN6899zIv2sj2gMyCuR8m/Ko928ZUw+X6u7Y="; "unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg="; }; }; From b684ee8b0409c67143b8c6f701da414619145f02 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 May 2023 17:58:34 +0200 Subject: [PATCH 24/43] checkov: 2.3.212 -> 2.3.214 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.3.212...2.3.214 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.3.214 --- pkgs/development/tools/analysis/checkov/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 61c0c66af2ac..10b3e5f8cf82 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.212"; + version = "2.3.214"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5x5kZJTECCXBbPEWIWTVUxvyvS7yO572pHGab7o9nR0="; + hash = "sha256-MmwMB5bb6mqZ9ZyBeOXF/rmofLLgvIRxEcj0uh+0zcA="; }; patches = [ @@ -118,6 +118,9 @@ buildPythonApplication rec { "console" # Starting to fail after 2.3.205 "test_non_multiline_pair" + "test_secret_value_in_keyword" + "test_runner_verify_secrets_skip_invalid_suppressed" + "test_runner_verify_secrets_skip_all_no_effect" ]; disabledTestPaths = [ From cf573698b1cc77560551f4110d780408c0da64c3 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 2 May 2023 12:29:21 -0400 Subject: [PATCH 25/43] ants: 2.4.3 -> 2.4.4 --- pkgs/applications/science/biology/ants/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index 4c5f3162febd..d71fbca4becd 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ANTs"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { - owner = "ANTsX"; - repo = "ANTs"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-S4HYhsqof27UXEYjKvbod8N7PkZDmwLdwcEAvJD0W5g="; + owner = "ANTsX"; + repo = "ANTs"; + rev = "refs/tags/v${version}"; + hash = "sha256-GQndI8ayBvqujb2/qXT6RBAfr8hNPCI5IbwYkPlyNg0="; }; nativeBuildInputs = [ cmake makeWrapper ]; From 5dadfddc58a0aadb9cce0b35b0ead652415c4d3f Mon Sep 17 00:00:00 2001 From: Adam Kirby Date: Tue, 2 May 2023 12:30:44 -0400 Subject: [PATCH 26/43] juicefs: add mount.juicefs symlink Add mount.juicefs symlink so that /etc/fstab can mount juicefs fsType as required to use the NixOS fileSystems option with juicefs --- pkgs/tools/filesystems/juicefs/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix index 3ffa678e3995..62565385558e 100644 --- a/pkgs/tools/filesystems/juicefs/default.nix +++ b/pkgs/tools/filesystems/juicefs/default.nix @@ -26,6 +26,10 @@ buildGoModule rec { rm $out/bin/libjfs ''; + postInstall = '' + ln -s $out/bin/juicefs $out/bin/mount.juicefs + ''; + meta = with lib; { description = "A distributed POSIX file system built on top of Redis and S3"; homepage = "https://www.juicefs.com/"; From 8de6471f50263dbc39fda70cf36e543133def8b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 May 2023 18:49:49 +0200 Subject: [PATCH 27/43] certipy: 4.3.0 -> 4.4.0 Diff: https://github.com/ly4k/Certipy/compare/refs/tags/4.3.0...4.4.0 Changelog: https://github.com/ly4k/Certipy/releases/tag/4.4.0 --- pkgs/tools/security/certipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/certipy/default.nix b/pkgs/tools/security/certipy/default.nix index 589e1f97e64b..ed11cbfab272 100644 --- a/pkgs/tools/security/certipy/default.nix +++ b/pkgs/tools/security/certipy/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "certipy"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; src = fetchFromGitHub { owner = "ly4k"; repo = "Certipy"; rev = "refs/tags/${version}"; - hash = "sha256-vwlWAbA4ExYAPRInhEsjRCNuL2wqMhAmYKO78Vi4OGo="; + hash = "sha256-llLGr9IpuXQYIN2WaOkvfE2dAZb3PMVlNmketUpuyDI="; }; propagatedBuildInputs = with python3.pkgs; [ From aad22fc6ce044e653b06470c6834d7bbb3463d36 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 2 May 2023 18:58:06 +0200 Subject: [PATCH 28/43] invidious: unstable-2023-04-10 -> unstable-2023-04-30 --- pkgs/servers/invidious/versions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 812397391667..974bcee989b0 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "961cae2b9a1e1dd780e3f92d55bbc7381b39ffe1", - "sha256": "sha256-8nt+N9WmfJQreRhVak5txZh/Rcm6kJPUt9DQgmwOB7g=", - "version": "unstable-2023-04-10" + "rev": "97e3938f5f6741d8645c1bdd37deebc6ddc06151", + "sha256": "sha256-JxJTbVcGp2fHAh2vxGAjAeoIYx/YUassgyu7d6kIelk=", + "version": "unstable-2023-04-30" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", From 824fa7042ee04f15ad4883037d72e4a33bd3bfd8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 May 2023 19:16:58 +0200 Subject: [PATCH 29/43] tlsx: 1.0.8 -> 1.0.9 Diff: https://github.com/projectdiscovery/tlsx/compare/v1.0.8...v1.0.9 Changelog: https://github.com/projectdiscovery/tlsx/releases/tag/v1.0.9 --- pkgs/tools/security/tlsx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tlsx/default.nix b/pkgs/tools/security/tlsx/default.nix index bb8eb3f6acf3..8767d16f1076 100644 --- a/pkgs/tools/security/tlsx/default.nix +++ b/pkgs/tools/security/tlsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tlsx"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-qwLYRRta1ElnhwWWBMAv6iXWKfic4vR9fuULATWJF3I="; + hash = "sha256-1lI4UyfUb+gXFwIfSauS/TBzEqrwQSY1UqzFDRXEBuE="; }; - vendorHash = "sha256-0Nyt/XY4gWL4yoS+Zq3hZUzjf3SySLmxrxfFryCTbTc="; + vendorHash = "sha256-xPKdyTXu2SUU5y5bk+8gZklG6QyAEdl+8LwJizvW9+o="; # Tests require network access doCheck = false; From 8bacab231d00d091c2403b7d1c279980e7c96587 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 May 2023 19:18:39 +0200 Subject: [PATCH 30/43] python311Packages.pydeps: 1.12.2 -> 1.12.3 Diff: https://github.com/thebjorn/pydeps/compare/refs/tags/v1.12.2...v1.12.3 Changelog: https://github.com/thebjorn/pydeps/releases/tag/v1.12.3 --- pkgs/development/python-modules/pydeps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index d47c77e533f7..275f533032fd 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.12.2"; + version = "1.12.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-c5A9iUq2M2PL76pi5v4AMqOsYLYYKN7ugYd8w7VfrYk="; + hash = "sha256-Zw5LGsNie2BAsJUWfL16HRdATpb5twkB5trBbIHNCc4="; }; buildInputs = [ From c78d0d9d3901a07cc9e54bcedf6f4677c9d4a2fa Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 2 May 2023 20:25:05 +0300 Subject: [PATCH 31/43] pkgsCross.loongarch64-linux.freshBootstrapTools.bootstrapFiles: fix build --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index d6815093d457..22a2b56bdc5d 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -44,7 +44,10 @@ in with pkgs; rec { }; build = - + let + # ${libc.src}/sysdeps/unix/sysv/linux/loongarch/lp64/libnsl.abilist does not exist! + withLibnsl = !stdenv.hostPlatform.isLoongArch64; + in stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; @@ -69,7 +72,9 @@ in with pkgs; rec { cp -d ${libc.out}/lib/libdl*.so* $out/lib cp -d ${libc.out}/lib/librt*.so* $out/lib cp -d ${libc.out}/lib/libpthread*.so* $out/lib + '' + lib.optionalString withLibnsl '' cp -d ${libc.out}/lib/libnsl*.so* $out/lib + '' + '' cp -d ${libc.out}/lib/libutil*.so* $out/lib cp -d ${libc.out}/lib/libnss*.so* $out/lib cp -d ${libc.out}/lib/libresolv*.so* $out/lib From d400dff7f4cfc036049bd69ee4d0602e2a99011b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 2 May 2023 14:33:12 -0300 Subject: [PATCH 32/43] shellhub-agent: 0.11.7 -> 0.11.8 Signed-off-by: Otavio Salvador --- pkgs/applications/networking/shellhub-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 006ef3ea0a02..90dca7c9f716 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -9,18 +9,18 @@ buildGo120Module rec { pname = "shellhub-agent"; - version = "0.11.7"; + version = "0.11.8"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "d5ESQQgBPUFe2tuCbeFIqiWPpr9wUczbXLc5QdXurXY="; + sha256 = "/nBwi94VFKzdZxQ030tCqEhDM0fE3bxc4MraOCNtmbE="; }; modRoot = "./agent"; - vendorSha256 = "sha256-/85rIBfFBpXYrsCBDGVzXfAxO6xXQ8uTL2XeEPKQwDQ="; + vendorSha256 = "sha256-1R5K/BlMNKtCESV5xVFh2MawfloSDmST2764WDXmqZk="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; From 28b07a359bed825b96aa0e9aa6c97e5747682b47 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 2 May 2023 14:33:35 -0300 Subject: [PATCH 33/43] shellhub-agent: add tests.version for checking if version matches Signed-off-by: Otavio Salvador --- pkgs/applications/networking/shellhub-agent/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 90dca7c9f716..3e3a5eee5f89 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -5,6 +5,8 @@ , makeWrapper , openssh , libxcrypt +, testers +, shellhub-agent }: buildGo120Module rec { @@ -29,6 +31,12 @@ buildGo120Module rec { rev-prefix = "v"; ignoredVersions = ".(rc|beta).*"; }; + + tests.version = testers.testVersion { + package = shellhub-agent; + command = "agent --version"; + version = "v${version}"; + }; }; nativeBuildInputs = [ makeWrapper ]; From c459330caf729c36d6191fb603cbde86acc5b263 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 2 May 2023 13:39:24 -0400 Subject: [PATCH 34/43] gifski: 1.10.3 -> 1.11.0, add figsoda as a maintainer Diff: https://github.com/ImageOptim/gifski/compare/1.10.3...1.11.0 Changelog: https://github.com/ImageOptim/gifski/releases/tag/1.11.0 --- pkgs/tools/graphics/gifski/Cargo.lock | 233 +++++++++++++++---------- pkgs/tools/graphics/gifski/default.nix | 23 ++- 2 files changed, 156 insertions(+), 100 deletions(-) diff --git a/pkgs/tools/graphics/gifski/Cargo.lock b/pkgs/tools/graphics/gifski/Cargo.lock index ff6f6438387d..6209f6b193b1 100644 --- a/pkgs/tools/graphics/gifski/Cargo.lock +++ b/pkgs/tools/graphics/gifski/Cargo.lock @@ -19,6 +19,55 @@ dependencies = [ "version_check", ] +[[package]] +name = "anstream" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys", +] + [[package]] name = "arrayvec" version = "0.7.2" @@ -33,9 +82,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bindgen" -version = "0.59.2" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ "bitflags", "cexpr", @@ -48,6 +97,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", + "syn", ] [[package]] @@ -85,9 +135,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clang-sys" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -96,26 +146,32 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.8" +version = "4.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" +checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819" dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab" +dependencies = [ + "anstream", + "anstyle", "bitflags", "clap_lex", - "is-terminal", "once_cell", "strsim", - "termcolor", ] [[package]] name = "clap_lex" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "color_quant" @@ -123,6 +179,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "crc32fast" version = "1.3.2" @@ -134,9 +196,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -177,9 +239,9 @@ dependencies = [ [[package]] name = "dunce" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" @@ -189,13 +251,13 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "errno" -version = "0.2.8" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys", ] [[package]] @@ -219,9 +281,9 @@ dependencies = [ [[package]] name = "ffmpeg-next" -version = "4.4.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4676cda947a87a1e8a42e154059c567e75de64860252cce52c684acd8c074fa0" +checksum = "8af03c47ad26832ab3aabc4cdbf210af3d3b878783edd5a7ba044ba33aab7a60" dependencies = [ "bitflags", "ffmpeg-sys-next", @@ -230,8 +292,8 @@ dependencies = [ [[package]] name = "ffmpeg-sys-next" -version = "4.4.0" -source = "git+https://github.com/kornelski/rust-ffmpeg-sys-1?rev=78458039d5fac99354f9cb078869f3be3f3af5fb#78458039d5fac99354f9cb078869f3be3f3af5fb" +version = "6.0.1" +source = "git+https://github.com/kornelski/rust-ffmpeg-sys-1?rev=94d5496d88900bdc0cad66733138134d0ea3cf31#94d5496d88900bdc0cad66733138134d0ea3cf31" dependencies = [ "bindgen", "cc", @@ -243,9 +305,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "miniz_oxide", @@ -284,7 +346,7 @@ dependencies = [ [[package]] name = "gifski" -version = "1.10.3" +version = "1.11.0" dependencies = [ "clap", "crossbeam-channel", @@ -340,12 +402,11 @@ checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] name = "imagequant" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f332f82fc531b53cffa3181c14f7beb5b6c33932d68bb0c2fa4fd583553fca64" +checksum = "fc3c62f251799ae51bbd7a94fc00a83fcb796d8dd14876280e3063e8341138dc" dependencies = [ "arrayvec", - "noisy_float", "num_cpus", "once_cell", "rayon", @@ -361,9 +422,9 @@ checksum = "b2cf49df1085dcfb171460e4592597b84abe50d900fb83efb6e41b20fefd6c2c" [[package]] name = "io-lifetimes" -version = "1.0.7" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e86b86ae312accbf05ade23ce76b625e0e47a255712b7414037385a1c05380" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ "hermit-abi 0.3.1", "libc", @@ -372,9 +433,9 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", @@ -396,9 +457,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" [[package]] name = "libloading" @@ -412,9 +473,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" [[package]] name = "lodepng" @@ -461,9 +522,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -474,15 +535,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" -[[package]] -name = "noisy_float" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978fe6e6ebc0bf53de533cd456ca2d9de13de13856eda1518a285d7705a213af" -dependencies = [ - "num-traits", -] - [[package]] name = "nom" version = "7.1.3" @@ -518,12 +570,6 @@ version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "pbr" version = "1.1.1" @@ -549,9 +595,9 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "proc-macro2" -version = "1.0.52" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -595,18 +641,18 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "resize" @@ -635,9 +681,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.36.9" +version = "0.37.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433" dependencies = [ "bitflags", "errno", @@ -666,12 +712,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "termcolor" -version = "1.2.0" +name = "syn" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "winapi-util", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] @@ -690,6 +738,12 @@ version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "vcpkg" version = "0.2.15" @@ -733,15 +787,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -750,18 +795,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -774,42 +819,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 60a042423c1e..1aa2eea10ab7 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -1,20 +1,25 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config }: +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, pkg-config +}: rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.10.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "sha256-P4t16rCKsL6FwDVXDC2XkgUGcAlWCPt1iXoBmhDZRzk="; + sha256 = "sha256-sPsq/hntNqOdPJcoob1jrDUrLLiBEnfRoDANyFUjOuM="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ffmpeg-sys-next-4.4.0" = "sha256-TpO06VjSLCUe3NH7sr5YPfEF7C0EBBxQIQ2/SbVncnI="; + "ffmpeg-sys-next-6.0.1" = "sha256-/KxW57lt9/qKqNUUZqJucsP0cKvZ1m/FdGCsZxBlxYc="; }; }; @@ -23,10 +28,16 @@ rustPlatform.buildRustPackage rec { # error: the crate `gifski` is compiled with the panic strategy `abort` which is incompatible with this crate's strategy of `unwind` doCheck = !stdenv.isDarwin; + # error: linker `/usr/bin/x86_64-linux-gnu-gcc` not found + postPatch = '' + rm .cargo/config.toml; + ''; + meta = with lib; { description = "GIF encoder based on libimagequant (pngquant)"; homepage = "https://gif.ski/"; - license = licenses.agpl3; - maintainers = [ maintainers.marsam ]; + changelog = "https://github.com/ImageOptim/gifski/releases/tag/${src.rev}"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ figsoda marsam ]; }; } From 83161a9b84eaa28d82e9f3fa6ed3dcbe59de7602 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 2 May 2023 13:48:18 -0400 Subject: [PATCH 35/43] ajour: normalize pname fixes `nix run .#ajour` --- pkgs/tools/games/ajour/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix index 250b112dbe71..bf783c7f4776 100644 --- a/pkgs/tools/games/ajour/default.nix +++ b/pkgs/tools/games/ajour/default.nix @@ -36,7 +36,7 @@ let ]; in rustPlatform.buildRustPackage rec { - pname = "Ajour"; + pname = "ajour"; version = "1.3.2"; src = fetchFromGitHub { From 1e434620095353f839f137bd295e9bd08efbd596 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 2 May 2023 20:05:04 +0200 Subject: [PATCH 36/43] got: 0.87 -> 0.88 --- pkgs/applications/version-management/got/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 610deabd0d7b..275bda217533 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.87"; + version = "0.88"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - hash = "sha256-fG8UihNXCxc0j01ImAAI3N0ViNrd9gnTUhRKs7Il5R4="; + hash = "sha256-F8EHMKAQq/fV/i6+Vf42hmVjhbptuuiO8zfE9kfzzqA="; }; nativeBuildInputs = [ pkg-config bison ] From 8133b85849bd54bcc9b12b71d066c471a9e147f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 May 2023 20:16:56 +0200 Subject: [PATCH 37/43] python311Packages.python-roborock: 0.8.3 -> 0.9.0 Diff: https://github.com/humbertogontijo/python-roborock/compare/refs/tags/v0.8.3...v0.9.0 Changelog: https://github.com/humbertogontijo/python-roborock/blob/0.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 4ca120090ea3..3a5e71847867 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -3,6 +3,7 @@ , async-timeout , buildPythonPackage , click +, construct , dacite , fetchFromGitHub , paho-mqtt @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.8.3"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-O7MjxCQ4JwFFC2ibdU8hCPhFPQhV5/LsmDO6vRdyYL0="; + hash = "sha256-w3UpbkBBSPcz3872HDp8MduAIgn0+8R+0C0pGU6fDJM="; }; nativeBuildInputs = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { aiohttp async-timeout click + construct dacite paho-mqtt pycryptodome From 94bd81c24f142cbd9bd03498df06805299f5ca05 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 2 May 2023 14:24:42 -0400 Subject: [PATCH 38/43] nil: 2023-04-03 -> 2023-05-02 Diff: https://github.com/oxalica/nil/compare/2023-04-03...2023-05-02 Changelog: https://github.com/oxalica/nil/releases/tag/2023-05-02 --- pkgs/development/tools/language-servers/nil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/nil/default.nix b/pkgs/development/tools/language-servers/nil/default.nix index 76df9f33a3bd..5c24b65835bd 100644 --- a/pkgs/development/tools/language-servers/nil/default.nix +++ b/pkgs/development/tools/language-servers/nil/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nil"; - version = "2023-04-03"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "oxalica"; repo = pname; rev = version; - hash = "sha256-d/TusDXmIo8IT5DNRA21lN+nOVSER8atIx9TJteR6LQ="; + hash = "sha256-T6iBqa9+KsVbcjNivRWXi2kXP90S+NJLp2qVah7I1w8="; }; - cargoHash = "sha256-DIar3idK+wajMU2sw1pX9j9IxfO+QnGogSFndDNu8R8="; + cargoHash = "sha256-ehT+i4Khen8fD6OZ6WMzFPtv1D49JyxmGmN0ZPKiOhk="; CFG_RELEASE = version; From 69e6642e4927e58f8463e3121f227a10f8092eb0 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 2 May 2023 21:10:56 +0200 Subject: [PATCH 39/43] gitlab: 15.11.0 -> 15.11.1 (#229447) https://about.gitlab.com/releases/2023/05/02/security-release-gitlab-15-11-1-released/ Fixes CVE-2023-2182 Fixes CVE-2023-1965 Fixes CVE-2023-1621 Fixes CVE-2023-2069 Fixes CVE-2023-1178 Fixes CVE-2023-0805 Fixes CVE-2023-0756 Fixes CVE-2023-1836 Fixes CVE-2022-4376 --- .../version-management/gitlab/data.json | 14 +++++++------- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index ddf0c75569b0..c39e428f405f 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.11.0", - "repo_hash": "sha256-oLdw6hDn7DLWvAt2RoHkixXCkzKm0dt7iid65MPH7kM=", - "yarn_hash": "0b4k43512p8lm1bmiq5piv8wg1f0x2h9q8pgwnms7b2xb4sfn0g1", + "version": "15.11.1", + "repo_hash": "sha256-xhwWn/+GSAKYy5YcjgIUPJUvhBquvCWu6eFg5ZiNM7s=", + "yarn_hash": "02ipm7agjy3c75df76c00k3qq5gpw3d876f6x91xnwizswsv9agb", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.11.0-ee", + "rev": "v15.11.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.11.0", - "GITLAB_PAGES_VERSION": "15.11.0", + "GITALY_SERVER_VERSION": "15.11.1", + "GITLAB_PAGES_VERSION": "15.11.1", "GITLAB_SHELL_VERSION": "14.18.0", - "GITLAB_WORKHORSE_VERSION": "15.11.0" + "GITLAB_WORKHORSE_VERSION": "15.11.1" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 5a9a542c22f0..c8cb7a86bc29 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.11.0"; + version = "15.11.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,7 +22,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-kpqSDtj9ctS5PVWTJv5z/HVXYjIlP6CU/FGgueXwKic="; + sha256 = "sha256-D12R9liFsrH0XwGSLkmhCbWMbPXrp0kzus4t4Kuw4cg="; }; vendorSha256 = "sha256-gJelagGPogeCdJtRpj4RaYlqzZRhtU0EIhmj1aK4ZOk="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 2a1ceed97a8c..38d076aa29e2 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "15.11.0"; + version = "15.11.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-nYpDyLg9nhl6EA0nwUzA+DFtyZVDnwplQTi1KJTwFbU="; + sha256 = "sha256-BPChY2t0ygH73XZYDWDb0EVPqrniMxzg3JWgcmsAesA="; }; vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index d673f314be70..418930feb52e 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 = "15.11.0"; + version = "15.11.1"; src = fetchFromGitLab { owner = data.owner; From 47ca73fe5911549fed320d9b188976e98da88820 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 May 2023 22:45:21 +0200 Subject: [PATCH 40/43] python311Packages.python-roborock: fix changelog entry --- pkgs/development/python-modules/python-roborock/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 3a5e71847867..968300ddc475 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library & console tool for controlling Roborock vacuum"; homepage = "https://github.com/humbertogontijo/python-roborock"; - changelog = "https://github.com/humbertogontijo/python-roborock/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/humbertogontijo/python-roborock/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; From 79e27b69757dbd972f35cee22d623969d85da7cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 May 2023 23:33:15 +0200 Subject: [PATCH 41/43] sshocker: init at 0.3.2 --- pkgs/tools/security/sshocker/default.nix | 32 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/security/sshocker/default.nix diff --git a/pkgs/tools/security/sshocker/default.nix b/pkgs/tools/security/sshocker/default.nix new file mode 100644 index 000000000000..027084ec0dcf --- /dev/null +++ b/pkgs/tools/security/sshocker/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "sshocker"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "lima-vm"; + repo = "sshocker"; + rev = "refs/tags/v${version}"; + hash = "sha256-u/H9X0YbjVFK8IMUmL6OdarP/ojqXjZAHI+k61Ja++w="; + }; + + vendorHash = "sha256-WcPKMF8KNx7zlsdTnFf8vnW/uZZL1F4JWqMK7+qmyCk="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/lima-vm/sshocker/pkg/version.Version=${version}" + ]; + + meta = with lib; { + description = "Tool for SSH, reverse sshfs and port forwarder"; + homepage = "https://github.com/lima-vm/sshocker"; + changelog = "https://github.com/lima-vm/sshocker/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96a42f49ceed..b5e91625a964 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12486,6 +12486,8 @@ with pkgs; sslmate-agent = callPackage ../development/tools/sslmate-agent { }; + sshocker = callPackage ../tools/security/sshocker { }; + sshoogr = callPackage ../tools/networking/sshoogr { }; ssocr = callPackage ../applications/misc/ssocr { }; From 72e8332e0c0f6a5f44545199261a6352efe55f0b Mon Sep 17 00:00:00 2001 From: lasers Date: Sun, 16 Apr 2023 14:22:40 -0500 Subject: [PATCH 42/43] xemu: 0.7.85 -> 0.7.87 --- pkgs/applications/emulators/xemu/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix index 50f2b57f887a..2b0b2e755ec1 100644 --- a/pkgs/applications/emulators/xemu/default.nix +++ b/pkgs/applications/emulators/xemu/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xemu"; - version = "0.7.85"; + version = "0.7.87"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; rev = "v${finalAttrs.version}"; - hash = "sha256-sVUkB2KegdKlHlqMvSwB1nLdJGun2x2x9HxtNHnpp1s="; + hash = "sha256-NPvyXDrTKt7PIspLPrUBo7qs9hsHV+6u7dQlIqdlQtw="; fetchSubmodules = true; }; @@ -89,20 +89,14 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - preConfigure = let - # When the data below can't be obtained through git, the build process tries - # to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar) - branch = "master"; - commit = "d8fa50e524c22f85ecb2e43108fd6a5501744351"; - inherit (finalAttrs) version; - in '' + preConfigure = '' patchShebangs . configureFlagsArray+=("--extra-cflags=-DXBOX=1 -Wno-error=redundant-decls") substituteInPlace ./scripts/xemu-version.sh \ --replace 'date -u' "date -d @$SOURCE_DATE_EPOCH '+%Y-%m-%d %H:%M:%S'" - echo '${commit}' > XEMU_COMMIT - echo '${branch}' > XEMU_BRANCH - echo '${version}' > XEMU_VERSION + # When the data below can't be obtained through git, the build process tries + # to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar) + echo '${finalAttrs.version}' > XEMU_VERSION ''; preBuild = '' From 72453271bb8e9adb053407b1f7feff8412e53527 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 3 May 2023 01:33:54 +0200 Subject: [PATCH 43/43] vscode-extensions.nvarner.typst-lsp: fix path to `typst-lsp` (#228856) --- pkgs/applications/editors/vscode/extensions/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2bbadd474aa2..394c89c83191 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -19,6 +19,7 @@ , alejandra , millet , shfmt +, typst-lsp , autoPatchelfHook , zlib , stdenv @@ -2278,6 +2279,14 @@ let version = "0.4.1"; sha256 = "sha256-NZejUb99JDcnqjihLTPkNzVCgpqDkbiwAySbBVZ0esY="; }; + + nativeBuildInputs = [ jq moreutils ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${typst-lsp}/bin/typst-lsp"' package.json | sponge package.json + ''; + meta = { changelog = "https://marketplace.visualstudio.com/items/nvarner.typst-lsp/changelog"; description = "A VSCode extension for providing a language server for Typst";