From 5ee8407c8251566e073b4e0c4878c54d227a96c9 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 24 Feb 2024 20:14:59 +0800 Subject: [PATCH 01/45] docker_20_10: remove --- .../applications/virtualization/docker/default.nix | 14 -------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 9b6bb0a48be3..a82a00fd5412 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -279,20 +279,6 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* - docker_20_10 = callPackage dockerGen rec { - version = "20.10.26"; - cliRev = "v${version}"; - cliHash = "sha256-EPhsng0kLnweVbC8ZnH0NK1/yHlYSA5Sred4rWJX/Gs="; - mobyRev = "v${version}"; - mobyHash = "sha256-IJ7m2mQnsLiom0EuZLpuLY6fYEko7rEy35igJv1AY04="; - runcRev = "v1.1.8"; - runcHash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4="; - containerdRev = "v1.6.22"; - containerdHash = "sha256-In7OkK3xm7Cz3H1jzG9b4tsZbmo44QCq8pNU+PPy8dY="; - tiniRev = "v0.19.0"; - tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; - }; - docker_24 = callPackage dockerGen rec { version = "24.0.5"; cliRev = "v${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10664dc2090b..ee4fb06d21c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30832,7 +30832,7 @@ with pkgs; dnglab = callPackage ../tools/graphics/dnglab { }; inherit (callPackage ../applications/virtualization/docker {}) - docker_20_10 docker_24 docker_25; + docker_24 docker_25; docker = docker_24; docker-client = docker.override { clientOnly = true; }; From e61656f55bacc244cb06755c3922ffa53eaf0391 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 7 Mar 2024 04:20:00 +0000 Subject: [PATCH 02/45] re-flex: 4.0.1 -> 4.1.0 Changelog: https://github.com/Genivia/RE-flex/releases/tag/v4.1.0 --- .../tools/parsing/re-flex/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/parsing/re-flex/default.nix b/pkgs/development/tools/parsing/re-flex/default.nix index 645d4e280288..c75245541287 100644 --- a/pkgs/development/tools/parsing/re-flex/default.nix +++ b/pkgs/development/tools/parsing/re-flex/default.nix @@ -1,30 +1,32 @@ { lib , stdenv , fetchFromGitHub -, autoreconfHook -, boost -, autoconf -, automake +, cmake }: stdenv.mkDerivation rec { pname = "re-flex"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; rev = "v${version}"; - sha256 = "sha256-eQ2+RthvOKCd2Dl6i+9DahJArFfOhPJkn6PI/yuaqos="; + hash = "sha256-pjYiCRKaskJg1IuCxNBUQ9FY2abGi4HEZxsfZ5ctjNY="; }; - nativeBuildInputs = [ boost autoconf automake ]; + outputs = [ "out" "bin" "dev" ]; + + nativeBuildInputs = [ + cmake + ]; meta = with lib; { - homepage = "https://github.com/Genivia/RE-flex"; + homepage = "https://www.genivia.com/doc/reflex/html"; description = "The regex-centric, fast lexical analyzer generator for C++ with full Unicode support"; license = licenses.bsd3; - platforms = platforms.unix; + platforms = platforms.all; maintainers = with lib.maintainers; [ prrlvr ]; + mainProgram = "reflex"; }; } From 870f58ffa94d8dd44246351aec220c77399ed4f8 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Tue, 2 Jan 2024 04:19:11 +0000 Subject: [PATCH 03/45] python3Packages.gpuctypes: init at unstable-2023-11-26 --- .../gpuctypes/0001-fix-dlopen-cuda.patch | 44 +++++++++ .../python-modules/gpuctypes/default.nix | 91 +++++++++++++++++++ .../gpuctypes/fix-dlopen-cuda.patch | 32 +++++++ pkgs/top-level/python-packages.nix | 2 + 4 files changed, 169 insertions(+) create mode 100644 pkgs/development/python-modules/gpuctypes/0001-fix-dlopen-cuda.patch create mode 100644 pkgs/development/python-modules/gpuctypes/default.nix create mode 100644 pkgs/development/python-modules/gpuctypes/fix-dlopen-cuda.patch diff --git a/pkgs/development/python-modules/gpuctypes/0001-fix-dlopen-cuda.patch b/pkgs/development/python-modules/gpuctypes/0001-fix-dlopen-cuda.patch new file mode 100644 index 000000000000..bc9f6c7ec64b --- /dev/null +++ b/pkgs/development/python-modules/gpuctypes/0001-fix-dlopen-cuda.patch @@ -0,0 +1,44 @@ +From d448321436e8314d3e2a6a09d4017c4bc10f612d Mon Sep 17 00:00:00 2001 +From: Gaetan Lepage +Date: Sat, 17 Feb 2024 17:37:22 +0100 +Subject: [PATCH] fix-dlopen-cuda + +--- + gpuctypes/cuda.py | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/gpuctypes/cuda.py b/gpuctypes/cuda.py +index acba81c..091f7f7 100644 +--- a/gpuctypes/cuda.py ++++ b/gpuctypes/cuda.py +@@ -143,9 +143,25 @@ def char_pointer_cast(string, encoding='utf-8'): + + + ++NAME_TO_PATHS = { ++ "libcuda.so": ["@driverLink@/lib/libcuda.so"], ++ "libnvrtc.so": ["@libnvrtc@"], ++} ++def _try_dlopen(name): ++ try: ++ return ctypes.CDLL(name) ++ except OSError: ++ pass ++ for candidate in NAME_TO_PATHS.get(name, []): ++ try: ++ return ctypes.CDLL(candidate) ++ except OSError: ++ pass ++ raise RuntimeError(f"{name} not found") ++ + _libraries = {} +-_libraries['libcuda.so'] = ctypes.CDLL(ctypes.util.find_library('cuda')) +-_libraries['libnvrtc.so'] = ctypes.CDLL(ctypes.util.find_library('nvrtc')) ++_libraries['libcuda.so'] = _try_dlopen('libcuda.so') ++_libraries['libnvrtc.so'] = _try_dlopen('libnvrtc.so') + + + cuuint32_t = ctypes.c_uint32 +-- +2.43.0 + diff --git a/pkgs/development/python-modules/gpuctypes/default.nix b/pkgs/development/python-modules/gpuctypes/default.nix new file mode 100644 index 000000000000..4b1d8560fa4d --- /dev/null +++ b/pkgs/development/python-modules/gpuctypes/default.nix @@ -0,0 +1,91 @@ +{ lib +, config +, buildPythonPackage +, fetchFromGitHub +, substituteAll +, addDriverRunpath +, cudaSupport ? config.cudaSupport +, rocmSupport ? config.rocmSupport +, cudaPackages +, setuptools +, ocl-icd +, rocmPackages +, pytestCheckHook +}: +buildPythonPackage rec { + pname = "gpuctypes"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + repo = "gpuctypes"; + owner = "tinygrad"; + rev = "refs/tags/${version}"; + hash = "sha256-xUMvMBK1UhZaMZfik0Ia6+siyZGpCkBV+LTnQvzt/rw="; + }; + + patches = [ + (substituteAll { + src = ./0001-fix-dlopen-cuda.patch; + inherit (addDriverRunpath) driverLink; + libnvrtc = + if cudaSupport + then "${lib.getLib cudaPackages.cuda_nvrtc}/lib/libnvrtc.so" + else "Please import nixpkgs with `config.cudaSupport = true`"; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + + postPatch = '' + substituteInPlace gpuctypes/opencl.py \ + --replace "ctypes.util.find_library('OpenCL')" "'${ocl-icd}/lib/libOpenCL.so'" + '' + # hipGetDevicePropertiesR0600 is a symbol from rocm-6. We are currently at rocm-5. + # We are not sure that this works. Remove when rocm gets updated to version 6. + + lib.optionalString rocmSupport '' + substituteInPlace gpuctypes/hip.py \ + --replace "/opt/rocm/lib/libamdhip64.so" "${rocmPackages.clr}/lib/libamdhip64.so" \ + --replace "/opt/rocm/lib/libhiprtc.so" "${rocmPackages.clr}/lib/libhiprtc.so" \ + --replace "hipGetDevicePropertiesR0600" "hipGetDeviceProperties" + + substituteInPlace gpuctypes/comgr.py \ + --replace "/opt/rocm/lib/libamd_comgr.so" "${rocmPackages.rocm-comgr}/lib/libamd_comgr.so" + ''; + + pythonImportsCheck = [ "gpuctypes" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + "test/test_opencl.py" + ] ++ lib.optionals (!rocmSupport) [ + "test/test_hip.py" + ] ++ lib.optionals (!cudaSupport) [ + "test/test_cuda.py" + ]; + + # Require GPU access to run (not available in the sandbox) + pytestFlagsArray = [ + "-k" "'not TestCUDADevice'" + "-k" "'not TestHIPDevice'" + ]; + + preCheck = lib.optionalString cudaSupport '' + addToSearchPath LD_LIBRARY_PATH ${lib.getLib cudaPackages.cuda_cudart}/lib/stubs + ''; + + # If neither rocmSupport or cudaSupport is enabled, no tests are selected + dontUsePytestCheck = !(rocmSupport || cudaSupport); + + meta = with lib; { + description = "Ctypes wrappers for HIP, CUDA, and OpenCL"; + homepage = "https://github.com/tinygrad/gpuctypes"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage matthewcroughan wozeparrot ]; + }; +} diff --git a/pkgs/development/python-modules/gpuctypes/fix-dlopen-cuda.patch b/pkgs/development/python-modules/gpuctypes/fix-dlopen-cuda.patch new file mode 100644 index 000000000000..8d3b69e35e11 --- /dev/null +++ b/pkgs/development/python-modules/gpuctypes/fix-dlopen-cuda.patch @@ -0,0 +1,32 @@ +diff --git a/gpuctypes/cuda.py b/gpuctypes/cuda.py +index acba81c..aac5fc7 100644 +--- a/gpuctypes/cuda.py ++++ b/gpuctypes/cuda.py +@@ -143,9 +143,25 @@ def char_pointer_cast(string, encoding='utf-8'): + + + ++NAME_TO_PATHS = { ++ "libcuda.so": ["@driverLink@/lib/libcuda.so"], ++ "libnvrtc.so": ["@libnvrtc@"], ++} ++def _try_dlopen(name): ++ try: ++ return ctypes.CDLL(name) ++ except OSError: ++ pass ++ for candidate in NAME_TO_PATHS.get(name, []): ++ try: ++ return ctypes.CDLL(candidate) ++ except OSError: ++ pass ++ raise RuntimeError(f"{name} not found") ++ + _libraries = {} +-_libraries['libcuda.so'] = ctypes.CDLL(ctypes.util.find_library('cuda')) +-_libraries['libnvrtc.so'] = ctypes.CDLL(ctypes.util.find_library('nvrtc')) ++_libraries['libcuda.so'] = _try_dlopen('libcuda.so') ++_libraries['libnvrtc.so'] = _try_dlopen('libnvrtc.so') + + + cuuint32_t = ctypes.c_uint32 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b90813500e44..1da6f92cce85 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4933,6 +4933,8 @@ self: super: with self; { gpsoauth = callPackage ../development/python-modules/gpsoauth { }; + gpuctypes = callPackage ../development/python-modules/gpuctypes { }; + gpustat = callPackage ../development/python-modules/gpustat { }; gpxpy = callPackage ../development/python-modules/gpxpy { }; From b7bcf94a708ce799a8586ce6255f80a27615731c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 21 Feb 2024 00:15:11 +0100 Subject: [PATCH 04/45] python311Packages.gpuctypes: add gpu tests Co-authored-by: SomeoneSerge --- .../python-modules/gpuctypes/default.nix | 44 +++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/gpuctypes/default.nix b/pkgs/development/python-modules/gpuctypes/default.nix index 4b1d8560fa4d..e5987f78ee07 100644 --- a/pkgs/development/python-modules/gpuctypes/default.nix +++ b/pkgs/development/python-modules/gpuctypes/default.nix @@ -11,7 +11,14 @@ , ocl-icd , rocmPackages , pytestCheckHook +, gpuctypes +, testCudaRuntime ? false +, testOpenclRuntime ? false +, testRocmRuntime ? false }: +assert testCudaRuntime -> cudaSupport; +assert testRocmRuntime -> rocmSupport; + buildPythonPackage rec { pname = "gpuctypes"; version = "0.3.0"; @@ -61,7 +68,7 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ + disabledTestPaths = lib.optionals (!testOpenclRuntime) [ "test/test_opencl.py" ] ++ lib.optionals (!rocmSupport) [ "test/test_hip.py" @@ -70,17 +77,46 @@ buildPythonPackage rec { ]; # Require GPU access to run (not available in the sandbox) - pytestFlagsArray = [ + pytestFlagsArray = lib.optionals (!testCudaRuntime) [ "-k" "'not TestCUDADevice'" + ] ++ lib.optionals (!testRocmRuntime) [ "-k" "'not TestHIPDevice'" + ] ++ lib.optionals (testCudaRuntime || testOpenclRuntime || testRocmRuntime) [ + "-v" ]; - preCheck = lib.optionalString cudaSupport '' + # Running these tests requires special configuration on the builder. + # e.g. https://github.com/NixOS/nixpkgs/pull/256230 implements a nix + # pre-build hook which exposes the devices and the drivers in the sandbox + # based on requiredSystemFeatures: + requiredSystemFeatures = lib.optionals testCudaRuntime [ + "cuda" + ] ++ lib.optionals testOpenclRuntime [ + "opencl" + ] ++ lib.optionals testRocmRuntime [ + "rocm" + ]; + + passthru.gpuChecks = { + cuda = gpuctypes.override { + cudaSupport = true; + testCudaRuntime = true; + }; + opencl = gpuctypes.override { + testOpenclRuntime = true; + }; + rocm = gpuctypes.override { + rocmSupport = true; + testRocmRuntime = true; + }; + }; + + preCheck = lib.optionalString (cudaSupport && !testCudaRuntime) '' addToSearchPath LD_LIBRARY_PATH ${lib.getLib cudaPackages.cuda_cudart}/lib/stubs ''; # If neither rocmSupport or cudaSupport is enabled, no tests are selected - dontUsePytestCheck = !(rocmSupport || cudaSupport); + dontUsePytestCheck = !(rocmSupport || cudaSupport) && (!testOpenclRuntime); meta = with lib; { description = "Ctypes wrappers for HIP, CUDA, and OpenCL"; From 24833cd162babe2c4d50b910d439d714fa8897d2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 11 Feb 2024 02:35:10 +0100 Subject: [PATCH 05/45] python3Packages.tinygrad: init at 0.8.0 Co-authored-by: matthewcroughan --- .../python-modules/tinygrad/default.nix | 111 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 113 insertions(+) create mode 100644 pkgs/development/python-modules/tinygrad/default.nix diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix new file mode 100644 index 000000000000..25b1f049bf69 --- /dev/null +++ b/pkgs/development/python-modules/tinygrad/default.nix @@ -0,0 +1,111 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, gpuctypes +, numpy +, tqdm +, hypothesis +, librosa +, onnx +, pillow +, pytest-xdist +, pytestCheckHook +, safetensors +, sentencepiece +, tiktoken +, torch +, transformers +}: + +buildPythonPackage rec { + pname = "tinygrad"; + version = "0.8.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tinygrad"; + repo = "tinygrad"; + rev = "refs/tags/v${version}"; + hash = "sha256-QAccZ79qUbe27yUykIf22WdkxYUlOffnMlShakKfp60="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + gpuctypes + numpy + tqdm + ]; + + pythonImportsCheck = [ "tinygrad" ]; + + nativeCheckInputs = [ + hypothesis + librosa + onnx + pillow + pytest-xdist + pytestCheckHook + safetensors + sentencepiece + tiktoken + torch + transformers + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = [ + # Require internet access + "test_benchmark_openpilot_model" + "test_bn_alone" + "test_bn_linear" + "test_bn_mnist" + "test_car" + "test_chicken" + "test_chicken_bigbatch" + "test_conv_mnist" + "testCopySHMtoDefault" + "test_data_parallel_resnet" + "test_e2e_big" + "test_fetch_small" + "test_huggingface_enet_safetensors" + "test_linear_mnist" + "test_load_convnext" + "test_load_enet" + "test_load_enet_alt" + "test_load_llama2bfloat" + "test_load_resnet" + "test_openpilot_model" + "test_resnet" + "test_shufflenet" + "test_transcribe_batch12" + "test_transcribe_batch21" + "test_transcribe_file1" + "test_transcribe_file2" + "test_transcribe_long" + "test_transcribe_long_no_batch" + "test_vgg7" + ]; + + disabledTestPaths = [ + "test/extra/test_lr_scheduler.py" + "test/models/test_mnist.py" + "test/models/test_real_world.py" + ]; + + meta = with lib; { + description = "A simple and powerful neural network framework"; + homepage = "https://github.com/tinygrad/tinygrad"; + changelog = "https://github.com/tinygrad/tinygrad/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1da6f92cce85..8bcdbe939dc9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14761,6 +14761,8 @@ self: super: with self; { tinydb = callPackage ../development/python-modules/tinydb { }; + tinygrad = callPackage ../development/python-modules/tinygrad { }; + tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { }; tinyrecord = callPackage ../development/python-modules/tinyrecord { }; From 2fe4dd4790409e676b76a394343b2def0cfd81e0 Mon Sep 17 00:00:00 2001 From: kilianar Date: Mon, 11 Mar 2024 16:22:24 +0100 Subject: [PATCH 06/45] fava: 1.27.2 -> 1.27.3 https://github.com/beancount/fava/releases/tag/v1.27.3 --- pkgs/applications/office/fava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 9cdc5d1b5014..d66587e79108 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -2,12 +2,12 @@ python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.27.2"; + version = "1.27.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-kLQAWFHDmzsBjVMm/ZUn+TFkM52W0h0jg0wSp1tmPZQ="; + hash = "sha256-GsnXZaazEiOhyjbIinHRD1fdoqlAp3d5csrmtydxmGM="; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; From 9582e133963ee82ea419f9426af14c73f5252051 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 12 Mar 2024 21:43:12 +0000 Subject: [PATCH 07/45] pypy27Packages.pulsar-client: use `throw` to report unsupported configurtion Before the change `pypy27Packages.pulsar-client` evaluation failed for uncatchable error if trying to access non-existent attribute. `throw` makes it a catchable error. --- pkgs/development/python-modules/pulsar-client/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pulsar-client/default.nix b/pkgs/development/python-modules/pulsar-client/default.nix index 65ce904eed4b..075fe4b99d84 100644 --- a/pkgs/development/python-modules/pulsar-client/default.nix +++ b/pkgs/development/python-modules/pulsar-client/default.nix @@ -108,7 +108,8 @@ in buildPythonPackage { format = "wheel"; - src = Srcs."${pythonVersion}-${stdenv.hostPlatform.system}"; + src = Srcs."${pythonVersion}-${stdenv.hostPlatform.system}" + or (throw "Unsupported '${pythonVersion}-${stdenv.hostPlatform.system}' target"); meta = with lib; { description = "Client for pulsar"; From ad07b9ff9a03af11b2e49c5756fe0dec9897c15f Mon Sep 17 00:00:00 2001 From: emattiza Date: Tue, 12 Mar 2024 17:23:33 -0500 Subject: [PATCH 08/45] otel-cli: 0.4.1 -> 0.4.4 updates otel-cli from 0.4.1 to 0.4.4 see https://github.com/equinix-labs/otel-cli/releases/tag/v0.4.4 for changelog and release details --- pkgs/tools/misc/otel-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/otel-cli/default.nix b/pkgs/tools/misc/otel-cli/default.nix index de35952f184a..1330188a3ee4 100644 --- a/pkgs/tools/misc/otel-cli/default.nix +++ b/pkgs/tools/misc/otel-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "otel-cli"; - version = "0.4.1"; + version = "0.4.4"; src = fetchFromGitHub { owner = "equinix-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-kOTReHG7byOqKsaVrXXNq9DAyawTz4hUeR4Q5lJKmiM="; + hash = "sha256-XVhnDtt2FhYgfGWDPFkneZTboeHGaIbiF5YdHoqB8N8="; }; vendorHash = "sha256-HwbEqWtOqiTe5Z/MtMAs63Lzvll/vgmbCpMTREXgtXA="; From 2e4791c8560049cc552f9fbdf05195c117687f93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Mar 2024 01:19:09 +0000 Subject: [PATCH 09/45] netbird-ui: 0.26.2 -> 0.26.3 --- pkgs/tools/networking/netbird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 20f146ab9330..6349b170706d 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.26.2"; + version = "0.26.3"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-fnKrv8bMONZbZGZtCQUAeGo3OIvOIqLX3nvVfGhYoK8="; + hash = "sha256-StZDhCBuwmJk8VimbsVO9Sfxlv5NcpV689YPUZRgOLk="; }; - vendorHash = "sha256-Zp8LAaADpSa/wfnLAQVJ8cG3bMkC7ZU1BT+Dz214c34="; + vendorHash = "sha256-n5n9bIQ026WlvwatMmEIBaLGfquTgek1eiQDb0xDAdI="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From 6cf3275b98918a5e9ab8d47366fa3ea6a223df98 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 13 Mar 2024 04:20:00 +0000 Subject: [PATCH 10/45] uv: 0.1.18 -> 0.1.19 Diff: https://github.com/astral-sh/uv/compare/0.1.18...0.1.19 Changelog: https://github.com/astral-sh/uv/blob/0.1.19/CHANGELOG.md --- pkgs/by-name/uv/uv/Cargo.lock | 581 +++++++++++++++++---------------- pkgs/by-name/uv/uv/package.nix | 6 +- 2 files changed, 308 insertions(+), 279 deletions(-) diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index 4c7b3d7182fe..207f4a992cd7 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -123,15 +123,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" [[package]] name = "arrayref" @@ -145,6 +145,16 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "assert-json-diff" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "assert_cmd" version = "2.0.14" @@ -211,7 +221,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -222,7 +232,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -265,6 +275,20 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "futures-core", + "getrandom", + "instant", + "pin-project-lite", + "rand", + "tokio", +] + [[package]] name = "backtrace" version = "0.3.69" @@ -372,20 +396,20 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", - "regex-automata 0.4.5", + "regex-automata 0.4.6", "serde", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytecheck" @@ -476,9 +500,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ "jobserver", "libc", @@ -508,9 +532,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" dependencies = [ "android-tzdata", "iana-time-zone", @@ -550,9 +574,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.0" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" +checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" dependencies = [ "clap_builder", "clap_derive", @@ -560,9 +584,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.0" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -620,7 +644,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -844,14 +868,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" [[package]] -name = "deranged" -version = "0.3.11" +name = "deadpool" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490" dependencies = [ - "powerfmt", + "async-trait", + "deadpool-runtime", + "num_cpus", + "tokio", ] +[[package]] +name = "deadpool-runtime" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49" + [[package]] name = "derivative" version = "2.2.0" @@ -1209,7 +1242,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -1311,7 +1344,7 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.5", + "regex-automata 0.4.6", "regex-syntax 0.8.2", ] @@ -1326,17 +1359,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "goblin" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb07a4ffed2093b118a525b1d8f5204ae274faed5604537caf7135d0f18d9887" -dependencies = [ - "log", - "plain", - "scroll", -] - [[package]] name = "h2" version = "0.3.24" @@ -1348,7 +1370,26 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.12", + "indexmap 2.2.5", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.1.0", "indexmap 2.2.5", "slab", "tokio", @@ -1358,9 +1399,9 @@ dependencies = [ [[package]] name = "half" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" dependencies = [ "cfg-if", "crunchy", @@ -1389,9 +1430,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1437,6 +1478,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -1444,7 +1496,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -1476,9 +1551,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.24", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -1490,6 +1565,27 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.2", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -1497,13 +1593,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.28", "rustls", "tokio", "tokio-rustls", ] +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.2.0", + "pin-project-lite", + "socket2", + "tokio", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -1547,7 +1659,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.5", + "regex-automata 0.4.6", "same-file", "walkdir", "winapi-util", @@ -1630,9 +1742,8 @@ dependencies = [ "once_cell", "pathdiff", "pep440_rs", - "platform-host", "platform-info", - "plist", + "platform-tags", "pypi-types", "reflink-copy", "regex", @@ -1727,9 +1838,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1845,15 +1956,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -1962,7 +2064,7 @@ checksum = "71e622f2a0dd84cbca79bc6c3c33f4fd7dc69faf992216516aacc1d136102800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -2002,9 +2104,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -2066,12 +2168,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - [[package]] name = "num-traits" version = "0.2.18" @@ -2143,9 +2239,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.99" +version = "0.9.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" dependencies = [ "cc", "libc", @@ -2195,6 +2291,16 @@ dependencies = [ "parking_lot_core 0.8.6", ] +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.9", +] + [[package]] name = "parking_lot_core" version = "0.8.6" @@ -2297,22 +2403,22 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -2333,28 +2439,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - -[[package]] -name = "platform-host" -version = "0.0.1" -dependencies = [ - "fs-err", - "goblin", - "once_cell", - "platform-info", - "plist", - "regex", - "serde", - "target-lexicon", - "thiserror", - "tracing", -] - [[package]] name = "platform-info" version = "2.0.2" @@ -2369,30 +2453,16 @@ dependencies = [ name = "platform-tags" version = "0.0.1" dependencies = [ - "platform-host", "rustc-hash", + "serde", "thiserror", ] -[[package]] -name = "plist" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" -dependencies = [ - "base64 0.21.7", - "indexmap 2.2.5", - "line-wrap", - "quick-xml", - "serde", - "time", -] - [[package]] name = "png" -version = "0.17.11" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2416,12 +2486,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - [[package]] name = "ppv-lite86" version = "0.2.17" @@ -2470,9 +2534,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -2500,7 +2564,7 @@ dependencies = [ [[package]] name = "pubgrub" version = "0.2.1" -source = "git+https://github.com/zanieb/pubgrub?rev=b5ead05c954b81690aec40255a1c36ec248e90af#b5ead05c954b81690aec40255a1c36ec248e90af" +source = "git+https://github.com/astral-sh/pubgrub?rev=addbaf184891d66a2dfd93d241a66d13bfe5de86#addbaf184891d66a2dfd93d241a66d13bfe5de86" dependencies = [ "indexmap 2.2.5", "log", @@ -2519,7 +2583,7 @@ dependencies = [ "indoc", "libc", "memoffset", - "parking_lot", + "parking_lot 0.12.1", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -2567,7 +2631,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -2580,7 +2644,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -2619,15 +2683,6 @@ dependencies = [ "toml", ] -[[package]] -name = "quick-xml" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" -dependencies = [ - "memchr", -] - [[package]] name = "quote" version = "1.0.35" @@ -2681,9 +2736,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -2762,7 +2817,7 @@ checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.5", + "regex-automata 0.4.6", "regex-syntax 0.8.2", ] @@ -2777,9 +2832,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -2840,9 +2895,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.24" +version = "0.11.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" dependencies = [ "async-compression", "base64 0.21.7", @@ -2850,10 +2905,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.24", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-rustls", "ipnet", "js-sys", @@ -2892,7 +2947,7 @@ checksum = "88a3e86aa6053e59030e7ce2d2a3b258dd08fc2d337d52f73f6cb480f5858690" dependencies = [ "anyhow", "async-trait", - "http", + "http 0.2.12", "reqwest", "serde", "task-local-extensions", @@ -2910,9 +2965,9 @@ dependencies = [ "chrono", "futures", "getrandom", - "http", - "hyper", - "parking_lot", + "http 0.2.12", + "hyper 0.14.28", + "parking_lot 0.11.2", "reqwest", "reqwest-middleware", "retry-policies", @@ -2963,16 +3018,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3149,15 +3205,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -3183,26 +3233,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "scroll" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6" -dependencies = [ - "scroll_derive", -] - -[[package]] -name = "scroll_derive" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "sct" version = "0.7.1" @@ -3259,7 +3289,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -3396,12 +3426,12 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3454,9 +3484,9 @@ checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" [[package]] name = "svg" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2198f991cd549041203080de947415bae45220eab7253c220b87e3188d19f21a" +checksum = "683eed9bd9a2b078f92f87d166db38292e8114ab16d4cf23787ad4eecd1bb6e5" [[package]] name = "svgfilters" @@ -3501,9 +3531,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -3566,9 +3596,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", @@ -3610,7 +3640,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -3621,7 +3651,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", "test-case-core", ] @@ -3647,29 +3677,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -3695,37 +3725,6 @@ dependencies = [ "tikv-jemalloc-sys", ] -[[package]] -name = "time" -version = "0.3.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" -dependencies = [ - "num-conv", - "time-core", -] - [[package]] name = "tiny-skia" version = "0.8.4" @@ -3808,7 +3807,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -3865,9 +3864,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e" dependencies = [ "serde", "serde_spanned", @@ -3886,9 +3885,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.5" +version = "0.22.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e68c159e8f5ba8a28c4eb7b0c0c190d77bb479047ca713270048145a9ad28a" +checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992" dependencies = [ "indexmap 2.2.5", "serde", @@ -3923,7 +3922,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -4085,18 +4084,18 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-script" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" [[package]] name = "unicode-vo" @@ -4199,7 +4198,7 @@ checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" [[package]] name = "uv" -version = "0.1.18" +version = "0.1.19" dependencies = [ "anstream", "anyhow", @@ -4230,7 +4229,6 @@ dependencies = [ "owo-colors 4.0.0", "pep440_rs", "pep508_rs", - "platform-host", "platform-tags", "predicates", "pubgrub", @@ -4254,6 +4252,7 @@ dependencies = [ "tracing-tree", "unicode-width", "url", + "uv-auth", "uv-build", "uv-cache", "uv-client", @@ -4275,8 +4274,20 @@ dependencies = [ name = "uv-auth" version = "0.0.1" dependencies = [ + "async-trait", + "base64 0.21.7", + "clap", + "once_cell", + "reqwest", + "reqwest-middleware", + "rust-netrc", + "task-local-extensions", + "tempfile", + "thiserror", + "tokio", "tracing", "url", + "wiremock", ] [[package]] @@ -4291,7 +4302,6 @@ dependencies = [ "itertools 0.12.1", "once_cell", "pep508_rs", - "platform-host", "pypi-types", "pyproject-toml", "regex", @@ -4338,7 +4348,6 @@ dependencies = [ "async-trait", "async_http_range_reader", "async_zip", - "base64 0.21.7", "cache-key", "chrono", "distribution-filename", @@ -4346,8 +4355,8 @@ dependencies = [ "fs-err", "futures", "html-escape", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.28", "insta", "install-wheel-rs", "pep440_rs", @@ -4359,7 +4368,6 @@ dependencies = [ "reqwest-retry", "rkyv", "rmp-serde", - "rust-netrc", "rustc-hash", "rustls", "rustls-native-certs", @@ -4404,7 +4412,6 @@ dependencies = [ "pep440_rs", "pep508_rs", "petgraph", - "platform-host", "platform-tags", "poloto", "pypi-types", @@ -4446,7 +4453,6 @@ dependencies = [ "futures", "itertools 0.12.1", "pep508_rs", - "platform-host", "platform-tags", "pypi-types", "rustc-hash", @@ -4523,6 +4529,7 @@ dependencies = [ name = "uv-fs" version = "0.0.1" dependencies = [ + "backoff", "dunce", "encoding_rs_io", "fs-err", @@ -4615,7 +4622,6 @@ dependencies = [ "once_cell", "pep440_rs", "pep508_rs", - "platform-host", "platform-tags", "pypi-types", "regex", @@ -4667,7 +4673,6 @@ dependencies = [ "pep440_rs", "pep508_rs", "petgraph", - "platform-host", "platform-tags", "pubgrub", "pypi-types", @@ -4714,7 +4719,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.1.18" +version = "0.1.19" [[package]] name = "uv-virtualenv" @@ -4726,7 +4731,7 @@ dependencies = [ "directories", "fs-err", "pathdiff", - "platform-host", + "platform-tags", "pypi-types", "serde", "serde_json", @@ -4837,9 +4842,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4847,24 +4852,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -4874,9 +4879,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4884,22 +4889,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" @@ -4922,7 +4927,7 @@ checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ "futures", "js-sys", - "parking_lot", + "parking_lot 0.11.2", "pin-utils", "wasm-bindgen", "wasm-bindgen-futures", @@ -4931,9 +4936,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -5167,9 +5172,9 @@ checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.6.1" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" dependencies = [ "memchr", ] @@ -5184,6 +5189,30 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "wiremock" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec874e1eef0df2dcac546057fe5e29186f09c378181cd7b635b4b7bcc98e9d81" +dependencies = [ + "assert-json-diff", + "async-trait", + "base64 0.21.7", + "deadpool", + "futures", + "http 1.1.0", + "http-body-util", + "hyper 1.2.0", + "hyper-util", + "log", + "once_cell", + "regex", + "serde", + "serde_json", + "tokio", + "url", +] + [[package]] name = "wyz" version = "0.5.1" diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index eacac082fa5b..faae25c0be0c 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -11,20 +11,20 @@ rustPlatform.buildRustPackage rec { pname = "uv"; - version = "0.1.18"; + version = "0.1.19"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = version; - hash = "sha256-lHvSfp+pCECVbuwSj7zNmheA1pleHaitKG0wf24s/CY="; + hash = "sha256-OJDN6guJpUfGhX2Sk47wLHfT3XT2mnSINPiI2DgyfsU="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "async_zip-0.0.16" = "sha256-M94ceTCtyQc1AtPXYrVGplShQhItqZZa/x5qLiL+gs0="; - "pubgrub-0.2.1" = "sha256-C3A6WzpmR3l8MgUCFzoDdehLVRgk3/2VbCVFUS+iS9M="; + "pubgrub-0.2.1" = "sha256-Pn60v5tfpGrssCeuaUcxw5eJ1g8Dk/+un0s8+k4abpo="; }; }; From 01a7b9d8abc7947bff4e9da34d101d976bb35ffd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Mar 2024 06:42:38 +0000 Subject: [PATCH 11/45] python311Packages.autoflake: 2.3.0 -> 2.3.1 --- pkgs/development/python-modules/autoflake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autoflake/default.nix b/pkgs/development/python-modules/autoflake/default.nix index 64d429629276..e6f9c94c3f8f 100644 --- a/pkgs/development/python-modules/autoflake/default.nix +++ b/pkgs/development/python-modules/autoflake/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { pname = "autoflake"; - version = "2.3.0"; + version = "2.3.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-jCAR+jRwG519zwW5hzvEhZ1Pzk5i3+qQ3/79FXb18B0="; + hash = "sha256-yYt13FsKhkWcTwGh0yrH60M47EMXpEaVFf8eaH7NkJ4="; }; nativeBuildInputs = [ From 96c6d758d22350e8774c47bb1335b9b7e4cd819b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Mar 2024 07:15:39 +0000 Subject: [PATCH 12/45] dolt: 1.35.1 -> 1.35.3 --- pkgs/servers/sql/dolt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 418b4b7f7155..ee3b30bd0363 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.35.1"; + version = "1.35.3"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-UtyLC+rPft4g4ENO3IzQDBmsyJg38zPxTVDWiuf7Kc8="; + sha256 = "sha256-p4hScXdIDa3zAHltUMhg61YyfpdFWZaJ8LAdQi8OZv8="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-VQVpKgqzfnRCoHnZSCq2RZywNYcLyBycz74Ir48QwCk="; + vendorHash = "sha256-1fH9JrWi38jtPjaN2lEplCkiLdYa4g6FsdcB8ZQqVD4="; proxyVendor = true; doCheck = false; From e0d2c123b9da07549e913028870862d4aa9d3916 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 13 Mar 2024 18:54:41 +0900 Subject: [PATCH 13/45] luaPackages.tiktoken_core: init at 0.2.1-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 33 +++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 8 +++++ 3 files changed, 42 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 939905ab81d9..325b2f30f047 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -116,6 +116,7 @@ stdlib,,,,41.2.2,,vyp teal-language-server,,,http://luarocks.org/dev,,, telescope.nvim,,,,,5.1, telescope-manix,,,,,, +tiktoken_core,,,,,,natsukium tl,,,,,,mephistophiles toml,,,,,,mrcjkb toml-edit,,,,,5.1,mrcjkb diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 3bc58c29ff96..785de9eafe44 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -3297,6 +3297,39 @@ buildLuarocksPackage { }; }) {}; +tiktoken_core = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luarocks-build-rust-mlua }: +buildLuarocksPackage { + pname = "tiktoken_core"; + version = "0.2.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/tiktoken_core-0.2.1-1.rockspec"; + sha256 = "0mdmrpg82vmk0cqiqdayyk4vvl299z0xqrg58q18dfs5nc27wkla"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/gptlang/lua-tiktoken", + "rev": "61d831a81a01ba095f8c94e148b721b3aa7b1e45", + "date": "2024-03-03T23:24:06+00:00", + "path": "/nix/store/5ik17k726wl8hpz295n7dqq3438k8ddj-lua-tiktoken", + "sha256": "11lpzxmmb4zglkp9czlzggd8i46r7whpq021b5d3fx7bc5a81d3n", + "hash": "sha256-drSAVGHrdDdaWUEAfCE/2ZCI2nuffpbupO+TVWv/l4Y=", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path" "sha256"]) ; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua luarocks-build-rust-mlua ]; + + meta = { + homepage = "https://github.com/gptlang/lua-tiktoken"; + description = "An experimental port of OpenAI's Tokenizer to lua"; + maintainers = with lib.maintainers; [ natsukium ]; + license.fullName = "MIT"; + }; +}) {}; + tl = callPackage({ argparse, buildLuarocksPackage, compat53, fetchgit, fetchurl, luafilesystem }: buildLuarocksPackage { pname = "tl"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index a0ad25043920..a828ffaa800a 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -642,6 +642,14 @@ with prev; ''; }); + tiktoken_core = prev.tiktoken_core.overrideAttrs (oa: { + cargoDeps = rustPlatform.fetchCargoTarball { + src = oa.src; + hash = "sha256-YApsOGfAw34zp069lyGR6FGjxty1bE23+Tic07f8zI4="; + }; + nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ]; + }); + toml = prev.toml.overrideAttrs (oa: { patches = [ ./toml.patch ]; From da7e5ef9600b9f13b1751eca19a40508028fc500 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Mar 2024 11:47:39 +0000 Subject: [PATCH 14/45] beeper: 3.99.22 -> 3.99.23 --- .../networking/instant-messengers/beeper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index f5363ee4cb63..f2c7d287d01e 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -11,11 +11,11 @@ }: let pname = "beeper"; - version = "3.99.22"; + version = "3.99.23"; name = "${pname}-${version}"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.99.22-build-240307lufv3wsra-x86_64.AppImage"; - hash = "sha256-T3MABc11rWRjCU+4fvbpYDVq4XjSVfEeBrS03ITw8x8="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.99.23-build-240309svrjfqia1-x86_64.AppImage"; + hash = "sha256-8kZk5tEJCcSPKgpsVKrHB5twujZF2LdepW7HIJsb52E="; }; appimage = appimageTools.wrapType2 { inherit version pname src; From 6d4dbbd0e98e3976fcf8043b78af11a10b406c3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Mar 2024 14:56:16 +0000 Subject: [PATCH 15/45] wayfirePlugins.wf-shell: 0.8.0 -> 0.8.1 --- pkgs/applications/window-managers/wayfire/wf-shell.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index 229a87234924..b71e667b31ad 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "wf-shell"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wf-shell"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-K5g9DfFlqZyPHDUswx3vtzh0D9ogOQ1p87ZrqyH35vs="; + hash = "sha256-/ajFPIk8VJnlu2DzvSyGD3bC4r/pxALTkZeLNvs9dTw="; }; nativeBuildInputs = [ From e10cc83872d60407666e7ba4acbed27bd22281a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Mar 2024 15:25:55 +0000 Subject: [PATCH 16/45] python311Packages.types-pillow: 10.2.0.20240213 -> 10.2.0.20240311 --- pkgs/development/python-modules/types-pillow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pillow/default.nix b/pkgs/development/python-modules/types-pillow/default.nix index 360eb5c83bed..b6b882218d19 100644 --- a/pkgs/development/python-modules/types-pillow/default.nix +++ b/pkgs/development/python-modules/types-pillow/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pillow"; - version = "10.2.0.20240213"; + version = "10.2.0.20240311"; format = "setuptools"; src = fetchPypi { inherit version; pname = "types-Pillow"; - hash = "sha256-SAC2G/fqva4vGxet4NCAcJ7TPp8moukA5HDotW6+I4c="; + hash = "sha256-9hH2uvfDeE/lUO6SsQgGD1VEpHw3xzrLgaeF8cYxJ3I="; }; # Modules doesn't have tests From 1b548251ee345880142c386376a1a70162966af7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Mar 2024 15:36:43 +0000 Subject: [PATCH 17/45] zoom-us: 5.17.10.3512 -> 5.17.11.3835 --- .../instant-messengers/zoom-us/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index d12bea03460e..5c96be3bb82e 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.17.10.30974"; - versions.x86_64-darwin = "5.17.10.30974"; - versions.x86_64-linux = "5.17.10.3512"; + versions.aarch64-darwin = "5.17.11.31580"; + versions.x86_64-darwin = "5.17.11.31580"; + versions.x86_64-linux = "5.17.11.3835"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-JWGy8je6hFDTSKPx4GAUDMJdi5/zKoj4KK5w6E0pcsI="; + hash = "sha256-oCCZksH5sgfPVxh6I7ZpIMvkMX0+HnL1R9voNRjTUP4="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-lO0fyW5catdgKZ7cAQhdAbfQW+EewdCjTne+ZC3UW3w="; + hash = "sha256-6bIUfS6bZWh7fEq2xY++nIbnmE5DJxte6sjyoSKUMzU="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-dXpfgouZjd+0YyHz1c/7VL3a1SATAX8BpkR4KBeEDbc="; + hash = "sha256-eIa8ESoYi0gPbJbqahqKKvnM7rGPT+WeMIYCyFEWHGE="; }; }; From 3ce595f42f2c881a19c8ac6e348ebf2b657f0813 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Mar 2024 16:30:13 +0000 Subject: [PATCH 18/45] pocketbase: 0.22.3 -> 0.22.4 --- pkgs/servers/pocketbase/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 094f501f783b..a68c26181458 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.22.3"; + version = "0.22.4"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-cJ/+A7gFPWkp8BxLWmEQaR1SloU4M1+cI3bV3VOkrD4="; + hash = "sha256-IhqrPXQ430sfdI8HB4cLS8dntluYgstO3DBfZyd8Jrk="; }; - vendorHash = "sha256-C4sipr1rxNIFY5FA94ogNhryGntLGIJStRJHy7NZjAs="; + vendorHash = "sha256-iXcMxsiKyCY91a7zCl+OxkHwSIKx/AfT0HOEpZ8JgeM="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; From b622ed3f841ba8b0ef36c56fe1197c38fb2787bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 10 Mar 2024 10:51:41 -0700 Subject: [PATCH 19/45] plfit: 0.9.4 -> 0.9.6 Diff: https://github.com/ntamas/plfit/compare/0.9.4...0.9.6 Changelog: https://github.com/ntamas/plfit/blob/0.9.6/CHANGELOG.md --- pkgs/tools/misc/plfit/default.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/plfit/default.nix b/pkgs/tools/misc/plfit/default.nix index 78e7c3572b6f..8b1726666bcc 100644 --- a/pkgs/tools/misc/plfit/default.nix +++ b/pkgs/tools/misc/plfit/default.nix @@ -7,17 +7,23 @@ , llvmPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "plfit"; - version = "0.9.4"; + version = "0.9.6"; src = fetchFromGitHub { owner = "ntamas"; repo = "plfit"; - rev = version; - hash = "sha256-hnmP/56P2anR0S8zQyQqN1lbge5GgK+P8Lx8bRkwSxA="; + rev = finalAttrs.version; + hash = "sha256-XRl6poEdgPNorFideQmEJHCU+phs4rIhMYa8iAOtL1A="; }; + postPatch = lib.optionalString (python != null) '' + substituteInPlace src/CMakeLists.txt \ + --replace-fail ' ''${Python3_SITEARCH}' ' ${placeholder "out"}/${python.sitePackages}' \ + --replace-fail ' ''${Python3_SITELIB}' ' ${placeholder "out"}/${python.sitePackages}' + ''; + nativeBuildInputs = [ cmake ] ++ lib.optionals (python != null) [ @@ -35,11 +41,13 @@ stdenv.mkDerivation rec { llvmPackages.openmp ]; + doCheck = true; + meta = with lib; { description = "Fitting power-law distributions to empirical data"; homepage = "https://github.com/ntamas/plfit"; - changelog = "https://github.com/ntamas/plfit/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/ntamas/plfit/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dotlambda ]; }; -} +}) From e3abe2987d47aee9ceb34a850da824471b53a39c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Mar 2024 19:10:14 +0000 Subject: [PATCH 20/45] clash-geoip: 20240212 -> 20240312 --- pkgs/data/misc/clash-geoip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index 1ad3226080a4..0ec9663cbac3 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20240212"; + version = "20240312"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-cNVEWdIRo2Z2FluZIR0O5o3Aso4tDcVyHAG3DkNmpSQ="; + sha256 = "sha256-h6nrlzFBRrvL+hUOnpWi/aixKDOlRoTV4zQYIHGslIY="; }; dontUnpack = true; From 91a2510d05a3747ec575d2f5e203a60926ef72cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Wed, 13 Mar 2024 16:21:10 -0300 Subject: [PATCH 21/45] maintainers: drop federicoschonborn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- maintainers/maintainer-list.nix | 10 ---------- nixos/tests/budgie.nix | 2 +- pkgs/applications/misc/valent/default.nix | 2 +- pkgs/by-name/wa/waycheck/package.nix | 2 +- pkgs/desktops/budgie/budgie-backgrounds/default.nix | 2 +- pkgs/desktops/budgie/budgie-control-center/default.nix | 2 +- pkgs/desktops/budgie/budgie-desktop-view/default.nix | 2 +- pkgs/desktops/budgie/budgie-desktop/default.nix | 2 +- pkgs/desktops/budgie/budgie-screensaver/default.nix | 2 +- pkgs/desktops/budgie/budgie-session/default.nix | 2 +- pkgs/desktops/budgie/magpie/default.nix | 2 +- .../plugins/budgie-analogue-clock-applet/default.nix | 2 +- .../plugins/budgie-media-player-applet/default.nix | 2 +- .../plugins/budgie-user-indicator-redux/default.nix | 2 +- pkgs/desktops/gnome/extensions/valent/default.nix | 2 +- pkgs/desktops/xfce/core/libxfce4windowing/default.nix | 2 +- pkgs/development/libraries/yyjson/default.nix | 2 +- pkgs/tools/misc/fastfetch/default.nix | 2 +- 18 files changed, 17 insertions(+), 27 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1cba31c18d0b..0b3ffab2c4af 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6249,16 +6249,6 @@ githubId = 541748; name = "Felipe Espinoza"; }; - federicoschonborn = { - name = "Federico Damián Schonborn"; - email = "fdschonborn@gmail.com"; - github = "FedericoSchonborn"; - githubId = 62166915; - matrix = "@FedericoDSchonborn:matrix.org"; - keys = [ - { fingerprint = "517A 8A6A 09CA A11C 9667 CEE3 193F 70F1 5C9A B0A0"; } - ]; - }; fedx-sudo = { email = "fedx-sudo@pm.me"; github = "FedX-sudo"; diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index fe0ed2cf80ed..89f6ed665635 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "budgie"; - meta.maintainers = [ lib.maintainers.federicoschonborn ]; + meta.maintainers = [ ]; nodes.machine = { ... }: { imports = [ diff --git a/pkgs/applications/misc/valent/default.nix b/pkgs/applications/misc/valent/default.nix index 09ec8609712d..fbd93fe504cc 100644 --- a/pkgs/applications/misc/valent/default.nix +++ b/pkgs/applications/misc/valent/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { homepage = "https://valent.andyholmes.ca"; changelog = "https://github.com/andyholmes/valent/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ gpl3Plus cc0 cc-by-sa-30 ]; - maintainers = with maintainers; [ federicoschonborn aleksana ]; + maintainers = with maintainers; [ aleksana ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/wa/waycheck/package.nix b/pkgs/by-name/wa/waycheck/package.nix index cb78db2d6e38..1c4077c9ecb6 100644 --- a/pkgs/by-name/wa/waycheck/package.nix +++ b/pkgs/by-name/wa/waycheck/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Simple GUI that displays the protocols implemented by a Wayland compositor"; homepage = "https://gitlab.freedesktop.org/serebit/waycheck"; license = licenses.asl20; - maintainers = with maintainers; [ julienmalka federicoschonborn ]; + maintainers = with maintainers; [ julienmalka ]; mainProgram = "waycheck"; platforms = platforms.linux; }; diff --git a/pkgs/desktops/budgie/budgie-backgrounds/default.nix b/pkgs/desktops/budgie/budgie-backgrounds/default.nix index fc51474af340..6ef178a4f341 100644 --- a/pkgs/desktops/budgie/budgie-backgrounds/default.nix +++ b/pkgs/desktops/budgie/budgie-backgrounds/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "The default background set for the Budgie Desktop"; homepage = "https://github.com/BuddiesOfBudgie/budgie-backgrounds"; platforms = platforms.linux; - maintainers = [ maintainers.federicoschonborn ]; + maintainers = [ ]; license = licenses.cc0; }; } diff --git a/pkgs/desktops/budgie/budgie-control-center/default.nix b/pkgs/desktops/budgie/budgie-control-center/default.nix index 1b3994911508..f2582434f295 100644 --- a/pkgs/desktops/budgie/budgie-control-center/default.nix +++ b/pkgs/desktops/budgie/budgie-control-center/default.nix @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BuddiesOfBudgie/budgie-control-center"; mainProgram = "budgie-control-center"; platforms = platforms.linux; - maintainers = [ maintainers.federicoschonborn ]; + maintainers = [ ]; license = licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/budgie/budgie-desktop-view/default.nix b/pkgs/desktops/budgie/budgie-desktop-view/default.nix index 2614db09c87f..27c2a016f3ad 100644 --- a/pkgs/desktops/budgie/budgie-desktop-view/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop-view/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "org.buddiesofbudgie.budgie-desktop-view"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/desktops/budgie/budgie-desktop/default.nix index 7dc23cf10f50..c89e2be046a3 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -102,6 +102,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop"; license = with lib.licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30 ]; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/desktops/budgie/budgie-screensaver/default.nix b/pkgs/desktops/budgie/budgie-screensaver/default.nix index ef7a0f3d762c..2ca4320ca565 100644 --- a/pkgs/desktops/budgie/budgie-screensaver/default.nix +++ b/pkgs/desktops/budgie/budgie-screensaver/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BuddiesOfBudgie/budgie-screensaver"; mainProgram = "budgie-screensaver"; platforms = platforms.linux; - maintainers = [ maintainers.federicoschonborn ]; + maintainers = [ ]; license = licenses.gpl2Only; }; } diff --git a/pkgs/desktops/budgie/budgie-session/default.nix b/pkgs/desktops/budgie/budgie-session/default.nix index 70b49080cb68..8eb5b0056c58 100644 --- a/pkgs/desktops/budgie/budgie-session/default.nix +++ b/pkgs/desktops/budgie/budgie-session/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Session manager for Budgie"; homepage = "https://github.com/BuddiesOfBudgie/budgie-session"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [federicoschonborn]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/desktops/budgie/magpie/default.nix b/pkgs/desktops/budgie/magpie/default.nix index 827948d24401..8332c97c177b 100644 --- a/pkgs/desktops/budgie/magpie/default.nix +++ b/pkgs/desktops/budgie/magpie/default.nix @@ -160,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Softish fork of Mutter 43.x"; homepage = "https://github.com/BuddiesOfBudgie/magpie"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ federicoschonborn ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }) diff --git a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix index c443cb72dd49..49738d3e3e09 100644 --- a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Analogue Clock Applet for the Budgie desktop"; homepage = "https://github.com/samlane-ma/analogue-clock-applet"; license = licenses.gpl3Plus; - maintainers = [ maintainers.federicoschonborn ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix index ae3a44f22fd0..8bb05f869e50 100644 --- a/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation { homepage = "https://github.com/zalesyc/budgie-media-player-applet"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix index 0d031dbaeb5a..12df68371121 100644 --- a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/EbonJaeger/budgie-user-indicator-redux/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.federicoschonborn ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/gnome/extensions/valent/default.nix b/pkgs/desktops/gnome/extensions/valent/default.nix index 7bb529b743bb..7148fc8d8bd0 100644 --- a/pkgs/desktops/gnome/extensions/valent/default.nix +++ b/pkgs/desktops/gnome/extensions/valent/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://valent.andyholmes.ca/"; changelog = "https://github.com/andyholmes/gnome-shell-extension-valent/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Plus; - maintainers = [ maintainers.federicoschonborn ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix index 6395497fccda..4ae9d9ca1b65 100644 --- a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix @@ -13,6 +13,6 @@ mkXfceDerivation { meta = { description = "Windowing concept abstraction library for X11 and Wayland"; license = lib.licenses.lgpl21Plus; - maintainers = with lib; [ maintainers.federicoschonborn ] ++ teams.xfce.members; + maintainers = lib.teams.xfce.members; }; } diff --git a/pkgs/development/libraries/yyjson/default.nix b/pkgs/development/libraries/yyjson/default.nix index 7fe163362864..b0e17fffad2a 100644 --- a/pkgs/development/libraries/yyjson/default.nix +++ b/pkgs/development/libraries/yyjson/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ibireme/yyjson"; changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ federicoschonborn ]; + maintainers = with maintainers; [ ]; }; }) diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 2e727896905d..b718452c3735 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Like neofetch, but much faster because written in C"; homepage = "https://github.com/fastfetch-cli/fastfetch"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ gerg-l khaneliman federicoschonborn ]; + maintainers = with lib.maintainers; [ gerg-l khaneliman ]; platforms = lib.platforms.all; mainProgram = "fastfetch"; }; From 6f419d213f296bba365a31e6cd6b72e314e18eab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Mar 2024 19:35:11 +0000 Subject: [PATCH 22/45] circt: 1.67.0 -> 1.68.0 --- pkgs/development/compilers/circt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index 551a325852dd..d06da963dad2 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -17,12 +17,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.67.0"; + version = "1.68.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-ftKtqKIgGVqiETTsirhydjmFiozqHoMRdu+IBZc8iMI="; + hash = "sha256-N2OpKzniVUqi+L48mD5W1wW1GdECPVWZCo30f4XD3n0="; fetchSubmodules = true; }; From b22c7cf76e9c602e388c631ce4e7545ee4682797 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Mar 2024 19:53:48 +0000 Subject: [PATCH 23/45] sentry-cli: 2.30.0 -> 2.30.2 --- pkgs/development/tools/sentry-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 63e773017ff6..c4c5437901d6 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.30.0"; + version = "2.30.2"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-pICQBV8tIGeNoQF694uaVGx1eFN0iLACv1ztKXucKlM="; + sha256 = "sha256-ThZb6/Mprz9qgEGsJ+EbENvjmgehDsjVgFGBq4PZMRM="; }; doCheck = false; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; nativeBuildInputs = [ installShellFiles pkg-config ]; - cargoHash = "sha256-sYPmVum1xY4p7imR1iZdXugM5je4ncNoEf0Q8dvWM4c="; + cargoHash = "sha256-yoBoPk5PvMLGvhU/kg+WwO5WgwEnfKQlnkCC6IctfAI="; postInstall = '' installShellCompletion --cmd sentry-cli \ From 97e9b34307dc4a7539d9dcdbeaae83686782d62a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Mar 2024 21:08:20 +0100 Subject: [PATCH 24/45] checkov: 3.2.36 -> 3.2.37 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.36...3.2.37 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.37 --- 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 b789e66d8784..97bc146e678c 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.36"; + version = "3.2.37"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-Of09iIRON1YLdHjmRVxerTlvUff8I8G5m+Y3pRBfRnY="; + hash = "sha256-aZKfS/xJYy5P+/xqReKty6yNQi8CcVfe4pOxios1/O4="; }; patches = [ From 3d1320c3f49bc1ea70d4d8cfcd4deec1c986893f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Mar 2024 21:09:07 +0100 Subject: [PATCH 25/45] route-graph: 0.2.0 -> 0.2.1 Diff: https://github.com/audiusGmbH/route-graph/compare/refs/tags/0.2.0...0.2.1 Changelog: https://github.com/audiusGmbH/route-graph/releases/tag/0.2.1 --- pkgs/by-name/ro/route-graph/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ro/route-graph/package.nix b/pkgs/by-name/ro/route-graph/package.nix index b90570dd4931..7b5e20451a98 100644 --- a/pkgs/by-name/ro/route-graph/package.nix +++ b/pkgs/by-name/ro/route-graph/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "route-graph"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "audiusGmbH"; repo = "route-graph"; rev = "refs/tags/${version}"; - hash = "sha256-sIUuy3J7wsxyTZ1XPSmQcDdoqfE+yKHqFKbYlwk7/j4="; + hash = "sha256-OOXLmHxWre5t4tysDXV23PTkyUG6Zcpanw0fVCOLFTM="; }; pythonRelaxDeps = [ From 2ccfd070797a916e486263e90074a00e4d59d502 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 00:31:51 +0000 Subject: [PATCH 26/45] boxbuddy: 2.1.3 -> 2.1.4 --- pkgs/by-name/bo/boxbuddy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix index 6a07d82d83cb..7885d551a5a2 100644 --- a/pkgs/by-name/bo/boxbuddy/package.nix +++ b/pkgs/by-name/bo/boxbuddy/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "boxbuddy"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "Dvlv"; repo = "BoxBuddyRS"; rev = version; - hash = "sha256-Jl9WhMqb40Olub5eV7Meu5DJi+bzWhPf3DCRPe4CMfo="; + hash = "sha256-954jMFWSIDDqtMitgc8456SMcQLzi6LhLbVvOC45fxQ="; }; - cargoHash = "sha256-HN+yGODTRXRa3AsBOuRVOnnU2pxBZfy0zlnCWs2oQCI="; + cargoHash = "sha256-08d0mPSGYySxw2uq16MNOu2Y39kjqyfZ8rJ2yTOL3/w="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here From fc50b57f664ffa071639e41f26db1d2a1a39e176 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 00:48:54 +0000 Subject: [PATCH 27/45] vulkan-caps-viewer: 3.33 -> 3.34 --- pkgs/tools/graphics/vulkan-caps-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index f5962d9aa6c4..4ab820b512e3 100644 --- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "vulkan-caps-viewer"; - version = "3.33"; + version = "3.34"; src = fetchFromGitHub { owner = "SaschaWillems"; repo = "VulkanCapsViewer"; rev = version; - hash = "sha256-eKUgsT3KDua+whO0JdtnniKqoRmBt58LELeUz24goPM="; + hash = "sha256-F1D/+Q/GXqQazTNgwdiHS9qqIHy0YGssmagw615E+xg="; # Note: this derivation strictly requires vulkan-header to be the same it was developed against. # To help us, they've put it in a git-submodule. # The result will work with any vulkan-loader version. From f07f73ae22b76036ab4f3b44b471b5be8f7601e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 01:08:33 +0000 Subject: [PATCH 28/45] shadowsocks-rust: 1.18.1 -> 1.18.2 --- pkgs/tools/networking/shadowsocks-rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 38fb6a60169b..25829872b8ae 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.18.1"; + version = "1.18.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - hash = "sha256-q7XtYOBruEmjPC4gx+hBO5oRwbxL7wQJenBS8Pl6yRk="; + hash = "sha256-wbbh4IpAla3I/xgmiuzy9E9npS/PUtRFCZS4dl7JYRQ="; }; - cargoHash = "sha256-av4xUjoUGt53UoEpWULv15JKVWZq1x0YXvF5XFf4meQ="; + cargoHash = "sha256-TPW+dic9KdtGXGlcEi7YAmt442ZJRifumnrmcX8+unM="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; From 95a793dacbe4dac46182a67467d147321b8e5188 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 01:30:55 +0000 Subject: [PATCH 29/45] doublecmd: 1.1.10 -> 1.1.11 --- pkgs/by-name/do/doublecmd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index 36f5d82e3267..2b8c27fc8470 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.10"; + version = "1.1.11"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-vRB4qUws3kqCf7gp8Lzt8e9p68FaAfQyFHj4oJS9QtI="; + hash = "sha256-8kxaJp9mSJ6fHOgVD5iFjecUU0Kt10KCAVSYMQt+bSw="; }; nativeBuildInputs = [ From 9503a00beb06f041503594294835443470ff9577 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 01:31:05 +0000 Subject: [PATCH 30/45] mbpoll: 1.5 -> 1.5.2 --- pkgs/by-name/mb/mbpoll/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mb/mbpoll/package.nix b/pkgs/by-name/mb/mbpoll/package.nix index 6a972506bfca..eecc8922e472 100644 --- a/pkgs/by-name/mb/mbpoll/package.nix +++ b/pkgs/by-name/mb/mbpoll/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mbpoll"; - version = "1.5"; + version = "1.5.2"; src = fetchFromGitHub { owner = "epsilonrt"; repo = "mbpoll"; rev = "v${finalAttrs.version}"; - hash = "sha256-rHjLDgfKtpREemttWt0pr7VtBjwZCSplUR4OWNBVW0c="; + hash = "sha256-rO3j/p7MABlxcwRAZm26u7wgODGFTtetSDhPWPzTuEA="; }; buildInputs = [ libmodbus ]; From 571cda48bd5cf8f817476503d0153709e7aa6f8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 01:43:28 +0000 Subject: [PATCH 31/45] kubernetes-helm: 3.14.2 -> 3.14.3 --- pkgs/applications/networking/cluster/helm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 4dc1fbd91a34..b46ed8f329b1 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.14.2"; + version = "3.14.3"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-7Cd5lxPSXXCvYLLh334qnDmd9zbF1LMxTNoZEBpzHS4="; + sha256 = "sha256-GC9rkB35m+a/9pEvD7aNjE4z3qrv33NES842crrzD3I="; }; - vendorHash = "sha256-pYB9J7Zf6MApGpFL7HzqIDcC/vERiVE4z8SsipIeJ7c="; + vendorHash = "sha256-f5tLyq9tP5tdE73Mlee9vAUSHqkUAtAJkwjZP/K6wPM="; subPackages = [ "cmd/helm" ]; ldflags = [ From 2d31e9a6c989f329c659b96d416f0c436879870f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 01:47:53 +0000 Subject: [PATCH 32/45] libgbinder: 1.1.37 -> 1.1.38 --- pkgs/development/libraries/libgbinder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index c0f4577078e2..3f30a443e094 100644 --- a/pkgs/development/libraries/libgbinder/default.nix +++ b/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.37"; + version = "1.1.38"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-/XxWOaT2f6+0apv0NzMsPoYBf3GLuaXyPkmTMTDtOes="; + sha256 = "sha256-k5oCwi1KvyRVawH0d4Kp+MCxkymAtl6zVk7DVRXFVMg="; }; outputs = [ "out" "dev" ]; From d823d0e1d72f0e8e0e937d9b6455e95c0cfb2305 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 02:06:10 +0000 Subject: [PATCH 33/45] python312Packages.aiomqtt: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/aiomqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomqtt/default.nix b/pkgs/development/python-modules/aiomqtt/default.nix index 634c031cbd74..16450a8758b9 100644 --- a/pkgs/development/python-modules/aiomqtt/default.nix +++ b/pkgs/development/python-modules/aiomqtt/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiomqtt"; - version = "2.0.0"; + version = "2.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sbtinstruments"; repo = "aiomqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-Ww4NdCtT04b4tRmarJjB4xmfRBNIQekP8iARAdpmBH0="; + hash = "sha256-bV1elEO1518LVLwNDN5pzjxRgcG34K1XUsK7fTw8h+8="; }; nativeBuildInputs = [ From 69d6d51c3c374fbfb9de9a2ba7172791b3949642 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 02:06:18 +0000 Subject: [PATCH 34/45] python312Packages.brother: 4.0.0 -> 4.0.2 --- pkgs/development/python-modules/brother/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index c19190e815ce..60907fe7f139 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "brother"; - version = "4.0.0"; + version = "4.0.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FLaSj1LQy/eWPxU1a4WGpsdoN5Zi4EwrgCmz8AXGeLc="; + hash = "sha256-n1CIozKuF0+N8Vg3QA2jy5xNLDBJPdnhVT/xg1R+t90="; }; nativeBuildInputs = [ From cac3b73d26596d2a1326ad8e1c21b4f74ceed393 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 02:06:20 +0000 Subject: [PATCH 35/45] python312Packages.asyauth: 0.0.18 -> 0.0.20 --- pkgs/development/python-modules/asyauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index 0e2da16189be..3421902ff830 100644 --- a/pkgs/development/python-modules/asyauth/default.nix +++ b/pkgs/development/python-modules/asyauth/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyauth"; - version = "0.0.18"; + version = "0.0.20"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-t2AolP0GZ88b0+FqHXHIP1V6TIV61Bvd8wVXpZZltK0="; + hash = "sha256-QQVgIPdonPXwpVl1nH8Cps4nGb2oTfeDvRBY1XgeUUs="; }; propagatedBuildInputs = [ From 2a6e06027a3e8e2c6fcb1919de8631bd7a1db855 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 02:22:34 +0000 Subject: [PATCH 36/45] flow: 0.230.0 -> 0.231.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index dc7edb5c79bd..09ee6c65a827 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.230.0"; + version = "0.231.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - hash = "sha256-8sfyjUlyJ9A96xD7n6BeJxDNhT7FMq/7HlVC373uLM8="; + hash = "sha256-xZ6hyAnfWMwNZfkDIPV+0Cjs/HBMwBME6tZwQW38Cmk="; }; postPatch = '' From 775007835238332d50207607b793678cfb2a2874 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 02:30:25 +0000 Subject: [PATCH 37/45] roxctl: 4.3.4 -> 4.3.5 --- pkgs/applications/networking/cluster/roxctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index 607137c8d77a..1bac7a553ecb 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "4.3.4"; + version = "4.3.5"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-5UMU3oKi3QhREum2YevOzwF5OOi8quPWgt+kgGjkeFQ="; + sha256 = "sha256-zTZ03Qtb3ndBf1MunhYS8rzPReExzEPGxCh1JexkwuA="; }; - vendorHash = "sha256-Jzv4ozR8RJiwkgVGGq6dlV/7rbBLq8hFe/Pm4SJZCkU="; + vendorHash = "sha256-Sl5eIK8PWeGi2V7q/Qm5Gfjj1A9nQPtM0BGdO6inPxk="; nativeBuildInputs = [ installShellFiles ]; From 9b744ec514fbd8ff16804e125f76a288d07a2afb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 02:32:58 +0000 Subject: [PATCH 38/45] rehex: 0.61.0 -> 0.61.1 --- pkgs/applications/editors/rehex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index 617ae79c6849..9a3ba2a4a59f 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "rehex"; - version = "0.61.0"; + version = "0.61.1"; src = fetchFromGitHub { owner = "solemnwarning"; repo = pname; rev = version; - hash = "sha256-NBBBeTy15q6G30XR2PVd/xdIg41U2pWSPtqpdQX/+9o="; + hash = "sha256-/m4s5BW33I9g9hi5j3Vtui271w8Jv91+rQrI3qpO5Og="; }; nativeBuildInputs = [ pkg-config which zip ] From ff01d03a114db0dd3941714debe1610ada6ea065 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 02:35:43 +0000 Subject: [PATCH 39/45] sketchybar-app-font: 2.0.7 -> 2.0.8 --- pkgs/data/fonts/sketchybar-app-font/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sketchybar-app-font/default.nix b/pkgs/data/fonts/sketchybar-app-font/default.nix index e4b7f43a1a2f..4b343e0ae54d 100644 --- a/pkgs/data/fonts/sketchybar-app-font/default.nix +++ b/pkgs/data/fonts/sketchybar-app-font/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; - hash = "sha256-HP9fCP3CPsxc/l8nklV7bvEl4mDUYvQp+fT10AFX5LM="; + hash = "sha256-WX30kF0DF85RNMapVrADCh1LKLnYpJdpgG/3dGWhuRs="; }; dontUnpack = true; From 21dc8540bee850bba0eccf431a0138819210944d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 02:49:50 +0000 Subject: [PATCH 40/45] abcmidi: 2024.03.05 -> 2024.03.13 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index ee0fe6183687..3f57ea9982fe 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2024.03.05"; + version = "2024.03.13"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-nZVI+fIS5av+RUX4P1CsncnQUuqDmIRoT1TGRLdg2Bg="; + hash = "sha256-lhnCf4Il3pRNY6tfb19qyRDbeuWSPK6JEmOrcG92MeI="; }; meta = with lib; { From dc7f50094abc847ae388fa032ed9ebcff09c2bdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 02:49:50 +0000 Subject: [PATCH 41/45] shopware-cli: 0.4.28 -> 0.4.29 --- pkgs/by-name/sh/shopware-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shopware-cli/package.nix b/pkgs/by-name/sh/shopware-cli/package.nix index 1a7f3d826d7e..9c7d026c958b 100644 --- a/pkgs/by-name/sh/shopware-cli/package.nix +++ b/pkgs/by-name/sh/shopware-cli/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shopware-cli"; - version = "0.4.28"; + version = "0.4.29"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; rev = version; - hash = "sha256-zj/PusNQtJsbwKi9USZUL/7Zy5IM5mHOz7fYkBYfD2Q="; + hash = "sha256-gAn/AkubIwcNBrqBWggVXEmqXuXxjt1xZop0dQ291pA="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; nativeCheckInputs = [ git dart-sass ]; - vendorHash = "sha256-h3XYXI9Lnfxrnm9U0u6ixDUGK6QBJU/GKVlODw+swy8="; + vendorHash = "sha256-S7M7B4jtAe1jD6W5q2UewgwG++ecE46Rrp2Qt6kCDeQ="; postInstall = '' export HOME="$(mktemp -d)" From e6c98dc9b8fcdc8ba9480d83ddc6524c0e0c9413 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 02:50:00 +0000 Subject: [PATCH 42/45] deck: 1.35.0 -> 1.36.0 --- pkgs/applications/networking/deck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/deck/default.nix b/pkgs/applications/networking/deck/default.nix index 203007087836..e6cccf088e46 100644 --- a/pkgs/applications/networking/deck/default.nix +++ b/pkgs/applications/networking/deck/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "deck"; - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; rev = "v${version}"; - hash = "sha256-Cng1T/TjhPttLFcI3if0Ea/M2edXDnrMVAFzAZmNAD8="; + hash = "sha256-bbHJilMh7qnGvYuid8/PmIg5m42jddqOOuMd7mzQmCo="; }; nativeBuildInputs = [ installShellFiles ]; @@ -21,7 +21,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-tv/wI4AN10io9x1wl2etKC+MB2vz+6FkmT/eJSsT4VI="; + vendorHash = "sha256-Er9m8G020SKEN8jMIhEYiKvF27YY4dZvG0noYaH3bPU="; postInstall = '' installShellCompletion --cmd deck \ From ce56b788da9f75e29c579d99e5a8d98343701f98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 03:08:16 +0000 Subject: [PATCH 43/45] automatic-timezoned: 2.0.6 -> 2.0.7 --- pkgs/tools/system/automatic-timezoned/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 3e5122467e18..2e65b6c7e5f4 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uywQshOjdz8Vi/yN6X25LQYVLv/indzTHPmE56BqidI="; + sha256 = "sha256-MMxLy7clzvE5LyrpvKCffBpyV0eiOn7aHMH929aT+KM="; }; - cargoHash = "sha256-8ZuJF3hdmOOP4s7FIIPc7xTUAPT5TahH/8Yn5hGEnX0="; + cargoHash = "sha256-dKcghpc2aaXOtcRpABqTzwtlRM2RBGzAnXZMFbMbdlk="; meta = with lib; { description = "Automatically update system timezone based on location"; From 8ebee0110d67c82a6597de88cced04565c6ccbb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 04:12:52 +0000 Subject: [PATCH 44/45] turso-cli: 0.88.8 -> 0.89.0 --- pkgs/development/tools/turso-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index 374fe9f3bfaf..9414d1114bcb 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -8,16 +8,16 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.88.8"; + version = "0.89.0"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-F+/xCs35ugdr2KlHbZ01wE9AX3qhsxvfaly/yDCcGJI="; + hash = "sha256-BFL5D4GkcYdHkEc5448jgQflhhncePYfHMTprPynvmU="; }; - vendorHash = "sha256-rTeW2RQhcdwJTAMQELm4cdObJbm8gk/I2Qz3Wk3+zpI="; + vendorHash = "sha256-oxlIaSSLZ6JirvUPOIHirp43G5qrDFJhNd6HjA9UYKo="; nativeBuildInputs = [ installShellFiles ]; From 1d3d0d6a89d84ecda3755ed46204d596621bb8bd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 14 Mar 2024 12:28:41 +0800 Subject: [PATCH 45/45] budgie: add myself (bobby285271) as maintainer Let's hope this package set is not too hard to maintain. --- maintainers/team-list.nix | 8 ++++++++ nixos/tests/budgie.nix | 2 +- pkgs/desktops/budgie/budgie-backgrounds/default.nix | 2 +- pkgs/desktops/budgie/budgie-control-center/default.nix | 2 +- pkgs/desktops/budgie/budgie-desktop-view/default.nix | 2 +- pkgs/desktops/budgie/budgie-desktop/default.nix | 2 +- pkgs/desktops/budgie/budgie-screensaver/default.nix | 2 +- pkgs/desktops/budgie/budgie-session/default.nix | 2 +- pkgs/desktops/budgie/magpie/default.nix | 2 +- .../plugins/budgie-analogue-clock-applet/default.nix | 2 +- .../budgie/plugins/budgie-media-player-applet/default.nix | 2 +- .../plugins/budgie-user-indicator-redux/default.nix | 2 +- 12 files changed, 19 insertions(+), 11 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 000b1300ac46..8e9194fd6371 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -96,6 +96,14 @@ with lib.maintainers; { shortName = "Blockchains"; }; + budgie = { + members = [ + bobby285271 + ]; + scope = "Maintain Budgie desktop environment"; + shortName = "Budgie"; + }; + buildbot = { members = [ lopsided98 diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index 89f6ed665635..ca898bba1bc4 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "budgie"; - meta.maintainers = [ ]; + meta.maintainers = lib.teams.budgie.members; nodes.machine = { ... }: { imports = [ diff --git a/pkgs/desktops/budgie/budgie-backgrounds/default.nix b/pkgs/desktops/budgie/budgie-backgrounds/default.nix index 6ef178a4f341..b554cda38aaf 100644 --- a/pkgs/desktops/budgie/budgie-backgrounds/default.nix +++ b/pkgs/desktops/budgie/budgie-backgrounds/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "The default background set for the Budgie Desktop"; homepage = "https://github.com/BuddiesOfBudgie/budgie-backgrounds"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = teams.budgie.members; license = licenses.cc0; }; } diff --git a/pkgs/desktops/budgie/budgie-control-center/default.nix b/pkgs/desktops/budgie/budgie-control-center/default.nix index f2582434f295..cc5a0c0b7061 100644 --- a/pkgs/desktops/budgie/budgie-control-center/default.nix +++ b/pkgs/desktops/budgie/budgie-control-center/default.nix @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BuddiesOfBudgie/budgie-control-center"; mainProgram = "budgie-control-center"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = teams.budgie.members; license = licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/budgie/budgie-desktop-view/default.nix b/pkgs/desktops/budgie/budgie-desktop-view/default.nix index 27c2a016f3ad..99d90b8ab888 100644 --- a/pkgs/desktops/budgie/budgie-desktop-view/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop-view/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "org.buddiesofbudgie.budgie-desktop-view"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + maintainers = lib.teams.budgie.members; }; }) diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/desktops/budgie/budgie-desktop/default.nix index c89e2be046a3..26c2231870b0 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -102,6 +102,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop"; license = with lib.licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30 ]; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + maintainers = lib.teams.budgie.members; }; }) diff --git a/pkgs/desktops/budgie/budgie-screensaver/default.nix b/pkgs/desktops/budgie/budgie-screensaver/default.nix index 2ca4320ca565..f4139cbbe2e6 100644 --- a/pkgs/desktops/budgie/budgie-screensaver/default.nix +++ b/pkgs/desktops/budgie/budgie-screensaver/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BuddiesOfBudgie/budgie-screensaver"; mainProgram = "budgie-screensaver"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = teams.budgie.members; license = licenses.gpl2Only; }; } diff --git a/pkgs/desktops/budgie/budgie-session/default.nix b/pkgs/desktops/budgie/budgie-session/default.nix index 8eb5b0056c58..90185f85b1f0 100644 --- a/pkgs/desktops/budgie/budgie-session/default.nix +++ b/pkgs/desktops/budgie/budgie-session/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Session manager for Budgie"; homepage = "https://github.com/BuddiesOfBudgie/budgie-session"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ]; + maintainers = lib.teams.budgie.members; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/desktops/budgie/magpie/default.nix b/pkgs/desktops/budgie/magpie/default.nix index 8332c97c177b..7793fdf4df3d 100644 --- a/pkgs/desktops/budgie/magpie/default.nix +++ b/pkgs/desktops/budgie/magpie/default.nix @@ -160,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Softish fork of Mutter 43.x"; homepage = "https://github.com/BuddiesOfBudgie/magpie"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = teams.budgie.members; platforms = platforms.linux; }; }) diff --git a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix index 49738d3e3e09..4b89b0889c29 100644 --- a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Analogue Clock Applet for the Budgie desktop"; homepage = "https://github.com/samlane-ma/analogue-clock-applet"; license = licenses.gpl3Plus; - maintainers = [ ]; + maintainers = teams.budgie.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix index 8bb05f869e50..6b9057e1567a 100644 --- a/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation { homepage = "https://github.com/zalesyc/budgie-media-player-applet"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + maintainers = lib.teams.budgie.members; }; } diff --git a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix index 12df68371121..aff5d0328085 100644 --- a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/EbonJaeger/budgie-user-indicator-redux/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ ]; + maintainers = teams.budgie.members; }; }