From 973a043a4a064b0b3ee6757291859076662c3a38 Mon Sep 17 00:00:00 2001 From: ckie Date: Thu, 8 Jun 2023 19:38:52 +0300 Subject: [PATCH 001/134] x2x: 1.27 -> unstable-2023-04-30 --- pkgs/tools/X11/x2x/default.nix | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix index f473344ad38c..3a766d63ba97 100644 --- a/pkgs/tools/X11/x2x/default.nix +++ b/pkgs/tools/X11/x2x/default.nix @@ -1,25 +1,18 @@ -{ lib, stdenv, fetchurl, imake, libX11, libXtst, libXext, gccmakedep }: +{ lib, stdenv, libX11, libXtst, libXext, fetchFromGitHub, autoreconfHook, pkg-config, libXi }: stdenv.mkDerivation rec { pname = "x2x"; - version = "1.27"; + version = "unstable-2023-04-30"; - src = fetchurl { - url = "https://github.com/downloads/dottedmag/x2x/x2x-${version}.tar.gz"; - sha256 = "0dha0kn1lbc4as0wixsvk6bn4innv49z9a0sm5wlx4q1v0vzqzyj"; + src = fetchFromGitHub { + owner = "dottedmag"; + repo = pname; + rev = "53692798fa0e991e0dd67cdf8e8126158d543d08"; + hash = "sha256-FUl2z/Yz9uZlUu79LHdsXZ6hAwSlqwFV35N+GYDNvlQ="; }; - nativeBuildInputs = [ imake gccmakedep ]; - buildInputs = [ libX11 libXtst libXext ]; - - hardeningDisable = [ "format" ]; - - buildFlags = [ "x2x" ]; - - installPhase = '' - install -D x2x $out/bin/x2x - install -D x2x.1 $out/man/man1/x2x.1 - ''; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libX11 libXtst libXext libXi ]; meta = with lib; { description = "Allows the keyboard, mouse on one X display to be used to control another X display"; From f0d3d7475dabb1296d9f623dfa7a6adc2e67d854 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 12 Aug 2023 19:26:53 +0100 Subject: [PATCH 002/134] sysstat: 12.6.2 -> 12.7.4 --- pkgs/os-specific/linux/sysstat/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index ce7aa5f753f2..303935d8adb4 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,12 +1,19 @@ -{ lib, stdenv, fetchurl, gettext, bzip2 }: +{ lib +, stdenv +, fetchFromGitHub +, gettext +, bzip2 +}: stdenv.mkDerivation rec { pname = "sysstat"; - version = "12.6.2"; + version = "12.7.4"; - src = fetchurl { - url = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${version}.tar.xz"; - hash = "sha256-PncTSu2qb8V9l0XaZ+39iZDhmt7nGsRxliKSYcVj+0g="; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-ELmSzWnJ8vGwGPwY/5MFp/2gQhMXMjNG4bHtCplfQSc="; }; buildInputs = [ gettext ]; From a94a26338c244a03008a3b6c0e150b581538727d Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Thu, 31 Aug 2023 21:17:17 +0200 Subject: [PATCH 003/134] arrow-cpp: 12.0.1 -> 13.0.0 --- .../arrow-cpp/cmake-find-protobuf.patch | 103 ++++++++++++++++-- .../libraries/arrow-cpp/darwin.patch | 11 -- .../libraries/arrow-cpp/default.nix | 7 +- 3 files changed, 98 insertions(+), 23 deletions(-) delete mode 100644 pkgs/development/libraries/arrow-cpp/darwin.patch diff --git a/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch b/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch index 5655c151e2f6..32c0a4cab584 100644 --- a/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch +++ b/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch @@ -1,18 +1,105 @@ -diff --git a/cmake_modules/FindProtobufAlt.cmake b/cmake_modules/FindProtobufAlt.cmake -index d29f757ae..61c6e16e1 100644 +diff --git a/cmake_modules/FindProtobufAlt.cmake b/cmake_modules/FindprotobufAlt.cmake +similarity index 60% +rename from cmake_modules/FindProtobufAlt.cmake +rename to cmake_modules/FindprotobufAlt.cmake +index 15fe1b4f2..19bdd6291 100644 --- a/cmake_modules/FindProtobufAlt.cmake -+++ b/cmake_modules/FindProtobufAlt.cmake -@@ -22,11 +22,8 @@ else() ++++ b/cmake_modules/FindprotobufAlt.cmake +@@ -16,24 +16,24 @@ + # under the License. + + if(ARROW_PROTOBUF_USE_SHARED) +- set(Protobuf_USE_STATIC_LIBS OFF) ++ set(protobuf_USE_STATIC_LIBS OFF) + else() +- set(Protobuf_USE_STATIC_LIBS ON) ++ set(protobuf_USE_STATIC_LIBS ON) endif() set(find_package_args) -if(ProtobufAlt_FIND_VERSION) - list(APPEND find_package_args ${ProtobufAlt_FIND_VERSION}) --endif() - if(ProtobufAlt_FIND_QUIETLY) ++if(protobufAlt_FIND_VERSION) ++ list(APPEND find_package_args ${protobufAlt_FIND_VERSION}) + endif() +-if(ProtobufAlt_FIND_QUIETLY) ++if(protobufAlt_FIND_QUIETLY) list(APPEND find_package_args QUIET) endif() -find_package(Protobuf ${find_package_args}) -set(ProtobufAlt_FOUND ${Protobuf_FOUND}) -+find_package(protobuf ${find_package_args}) -+set(ProtobufAlt_FOUND ${protobuf_FOUND}) +-if(ProtobufAlt_FOUND) +- set(ProtobufAlt_VERSION ${Protobuf_VERSION}) +- set(ProtobufAlt_VERSION_MAJOR ${Protobuf_VERSION_MAJOR}) +- set(ProtobufAlt_VERSION_MINOR ${Protobuf_VERSION_MINOR}) +- set(ProtobufAlt_VERSION_PATCH ${Protobuf_VERSION_PATCH}) +- set(ProtobufAlt_VERSION_TWEEK ${Protobuf_VERSION_TWEEK}) ++find_package(protobuf ${find_package_args} CONFIG) ++set(protobufAlt_FOUND ${protobuf_FOUND}) ++if(protobufAlt_FOUND) ++ set(protobufAlt_VERSION ${protobuf_VERSION}) ++ set(protobufAlt_VERSION_MAJOR ${protobuf_VERSION_MAJOR}) ++ set(protobufAlt_VERSION_MINOR ${protobuf_VERSION_MINOR}) ++ set(protobufAlt_VERSION_PATCH ${protobuf_VERSION_PATCH}) ++ set(protobufAlt_VERSION_TWEEK ${protobuf_VERSION_TWEEK}) + endif() +diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake +index 94f926039..8efc98323 100644 +--- a/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cmake_modules/ThirdpartyToolchain.cmake +@@ -63,7 +63,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES + opentelemetry-cpp + ORC + re2 +- Protobuf ++ protobuf + RapidJSON + Snappy + Substrait +@@ -189,7 +189,7 @@ macro(build_dependency DEPENDENCY_NAME) + build_opentelemetry() + elseif("${DEPENDENCY_NAME}" STREQUAL "ORC") + build_orc() +- elseif("${DEPENDENCY_NAME}" STREQUAL "Protobuf") ++ elseif("${DEPENDENCY_NAME}" STREQUAL "protobuf") + build_protobuf() + elseif("${DEPENDENCY_NAME}" STREQUAL "RapidJSON") + build_rapidjson() +@@ -1722,7 +1722,7 @@ if(ARROW_WITH_PROTOBUF) + # "3" for 3.12.0 are different. So 23.4 is rejected with 3.12.0. If + # we use FORCE_ANY_NEWER_VERSION here, we can bypass the check and + # use 23.4. +- resolve_dependency(Protobuf ++ resolve_dependency(protobuf + FORCE_ANY_NEWER_VERSION + TRUE + HAVE_ALT +@@ -1732,7 +1732,7 @@ if(ARROW_WITH_PROTOBUF) + PC_PACKAGE_NAMES + protobuf) + +- if(NOT Protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN) ++ if(NOT protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN) + add_definitions(-DPROTOBUF_USE_DLLS) + endif() + +@@ -1768,8 +1768,8 @@ if(ARROW_WITH_PROTOBUF) + message(STATUS "Found protoc: ${PROTOBUF_PROTOC_EXECUTABLE}") + get_target_property(PROTOBUF_TYPE ${ARROW_PROTOBUF_LIBPROTOBUF} TYPE) + if(NOT STREQUAL "INTERFACE_LIBRARY") +- # Protobuf_PROTOC_LIBRARY is set by all versions of FindProtobuf.cmake +- message(STATUS "Found libprotoc: ${Protobuf_PROTOC_LIBRARY}") ++ # protobuf_PROTOC_LIBRARY is set by all versions of FindProtobuf.cmake ++ message(STATUS "Found libprotoc: ${protobuf_PROTOC_LIBRARY}") + get_target_property(PROTOBUF_LIBRARY ${ARROW_PROTOBUF_LIBPROTOBUF} IMPORTED_LOCATION) + message(STATUS "Found libprotobuf: ${PROTOBUF_LIBRARY}") + message(STATUS "Found protobuf headers: ${PROTOBUF_INCLUDE_DIR}") +@@ -3986,7 +3986,7 @@ endmacro() + + if(ARROW_WITH_GRPC) + set(ARROW_GRPC_REQUIRED_VERSION "1.30.0") +- if(NOT Protobuf_SOURCE STREQUAL gRPC_SOURCE) ++ if(NOT protobuf_SOURCE STREQUAL gRPC_SOURCE) + # ARROW-15495: Protobuf/gRPC must come from the same source + message(STATUS "Forcing gRPC_SOURCE to Protobuf_SOURCE (${Protobuf_SOURCE})") + set(gRPC_SOURCE "${Protobuf_SOURCE}") diff --git a/pkgs/development/libraries/arrow-cpp/darwin.patch b/pkgs/development/libraries/arrow-cpp/darwin.patch deleted file mode 100644 index de9b1986ffed..000000000000 --- a/pkgs/development/libraries/arrow-cpp/darwin.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/cmake_modules/FindPythonLibsNew.cmake b/cmake_modules/FindPythonLibsNew.cmake ---- a/cmake_modules/FindPythonLibsNew.cmake -+++ b/cmake_modules/FindPythonLibsNew.cmake -@@ -117,6 +117,7 @@ list(GET _PYTHON_VALUES 6 PYTHON_SIZEOF_VOID_P) - list(GET _PYTHON_VALUES 7 PYTHON_LIBRARY_SUFFIX) - list(GET _PYTHON_VALUES 8 PYTHON_LIBRARY_PATH) - list(GET _PYTHON_VALUES 9 PYTHON_OTHER_LIBS) -+string(REPLACE "-lncurses" "" PYTHON_OTHER_LIBS "${PYTHON_OTHER_LIBS}") - - # Make sure the Python has the same pointer-size as the chosen compiler - # Skip the check on OS X, it doesn't consistently have CMAKE_SIZEOF_VOID_P defined diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index c1bbc3e303d1..ddf8db98b39b 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -78,11 +78,11 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "12.0.1"; + version = "13.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-NIHEETk6oVx16I2Tz4MV+vf0PhgP4HkBKNOEDUF96Fg="; + hash = "sha256-Nd/aGRJip1a+k07viv7o0JdiytJQIdqmJuskniUayeY="; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -120,8 +120,7 @@ stdenv.mkDerivation rec { }; patches = [ - # patch to fix python-test - ./darwin.patch + # Protobuf switched to lower case project name. ./cmake-find-protobuf.patch ]; From 219775241d845a2c6220420d649e1f362053dc33 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sat, 2 Sep 2023 06:56:43 +0200 Subject: [PATCH 004/134] python3Packages.dask: disable failing test --- pkgs/development/python-modules/dask/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 5166afde24de..355e16553be0 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -134,6 +134,8 @@ buildPythonPackage rec { # AttributeError: 'str' object has no attribute 'decode' "test_read_dir_nometa" ] ++ [ + # https://github.com/dask/dask/issues/10347#issuecomment-1589683941 + "test_concat_categorical" # AttributeError: 'ArrowStringArray' object has no attribute 'tobytes'. Did you mean: 'nbytes'? "test_dot" "test_dot_nan" From 52a3f592df60fe092964de85740499e35a7683c8 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sat, 2 Sep 2023 14:30:19 +0200 Subject: [PATCH 005/134] python3Packages.intake: disable failing tests --- pkgs/development/python-modules/intake/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 98450dd31ea9..46c7ab88248a 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -107,6 +107,16 @@ buildPythonPackage rec { "test_python" # Timing-based, flaky on darwin and possibly others "TestServerV1Source.test_idle_timer" + # arrow-cpp-13 related + "test_read" + "test_pickle" + "test_read_dask" + "test_read_list" + "test_read_list_with_glob" + "test_to_dask" + "test_columns" + "test_df_transform" + "test_pipeline_apply" ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ # Flaky with older low-res mtime on darwin < 10.13 (#143987) "test_second_load_timestamp" From 472525b1cf361b9a0aef3e3056d0a407708dcd37 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sun, 3 Sep 2023 10:25:46 +0200 Subject: [PATCH 006/134] python3Packages.dask-awkward: adjust to pyarrow-13 --- pkgs/development/python-modules/dask-awkward/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index d7ef1204bc3e..a0ae12d7c13e 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , dask , fetchFromGitHub +, fetchpatch , hatch-vcs , hatchling , pyarrow @@ -25,6 +26,14 @@ buildPythonPackage rec { hash = "sha256-sSsd35Psf3VEydkNxtd9mSBzV23S7fRM/jhbC9T62kY="; }; + patches = [ + (fetchpatch { + name = "dask-awkward-pyarrow13-test-fixes.patch"; + url = "https://github.com/dask-contrib/dask-awkward/commit/abe7f4504b4f926232e4d0dfa5c601d265773d85.patch"; + hash = "sha256-IYlKTV6YasuKIJutB4cCmHeglGWUwBcvFgx1MZw4hjU="; + }) + ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; pythonRelaxDeps = [ From 557163a1ddbda6c3c71be1fab1318d3413be5bd1 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Sun, 3 Sep 2023 22:48:15 +0800 Subject: [PATCH 007/134] boost183: init at 1.83.0 --- pkgs/development/libraries/boost/1.83.nix | 14 ++++++++++++++ pkgs/development/libraries/boost/default.nix | 1 + pkgs/development/libraries/boost/generic.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/boost/1.83.nix diff --git a/pkgs/development/libraries/boost/1.83.nix b/pkgs/development/libraries/boost/1.83.nix new file mode 100644 index 000000000000..df5c5a5bbd31 --- /dev/null +++ b/pkgs/development/libraries/boost/1.83.nix @@ -0,0 +1,14 @@ +{ callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.83.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_83_0.html + sha256 = "6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e"; + }; +}) diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix index 7a8902bc395d..7f6422515ace 100644 --- a/pkgs/development/libraries/boost/default.nix +++ b/pkgs/development/libraries/boost/default.nix @@ -23,4 +23,5 @@ in { boost180 = makeBoost ./1.80.nix; boost181 = makeBoost ./1.81.nix; boost182 = makeBoost ./1.82.nix; + boost183 = makeBoost ./1.83.nix; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 5de26ef5ce2b..3a4c0e17ba93 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -113,6 +113,13 @@ stdenv.mkDerivation { relative = "include"; sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; }) + # Fixes ABI detection + ++ lib.optional (version == "1.83.0") (fetchpatch { + url = "https://github.com/boostorg/context/commit/6fa6d5c50d120e69b2d8a1c0d2256ee933e94b3b.patch"; + stripLen = 1; + extraPrefix = "libs/context/"; + sha256 = "sha256-bCfLL7bD1Rn4Ie/P3X+nIcgTkbXdCX6FW7B9lHsmVW8="; + }) # This fixes another issue regarding ill-formed constant expressions, which is a default error # in clang 16 and will be a hard error in clang 17. ++ lib.optional (lib.versionOlder version "1.80") (fetchpatch { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 497ff2761007..09b0c8b87ce5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20834,6 +20834,7 @@ with pkgs; boost180 boost181 boost182 + boost183 ; boost = boost181; From 11c98fd1ec1d6fe769467754097fbc5e76f448d5 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sun, 3 Sep 2023 11:11:37 +0200 Subject: [PATCH 008/134] python3Packages.{google-cloud-bigquery,insightface,worldengine}: mark as broken --- .../python-modules/google-cloud-bigquery/default.nix | 2 ++ pkgs/development/python-modules/insightface/default.nix | 3 +++ pkgs/development/python-modules/worldengine/default.nix | 1 + 3 files changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 69a32d87a1f5..7edbedb80c6a 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -127,6 +127,8 @@ buildPythonPackage rec { ]; meta = with lib; { + # Not compatible with pyarrow13 yet. + broken = true; description = "Google BigQuery API client library"; homepage = "https://github.com/googleapis/python-bigquery"; changelog = "https://github.com/googleapis/python-bigquery/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/insightface/default.nix b/pkgs/development/python-modules/insightface/default.nix index 6d5c4a66239c..e06b86f91802 100644 --- a/pkgs/development/python-modules/insightface/default.nix +++ b/pkgs/development/python-modules/insightface/default.nix @@ -69,6 +69,9 @@ buildPythonPackage rec { doCheck = false; # Upstream has no tests meta = with lib; { + # Both protobuf3 and protobuf4 in the build closure. + # related: https://github.com/onnx/onnx/issues/5563 + broken = true; description = "State-of-the-art 2D and 3D Face Analysis Project"; homepage = "https://github.com/deepinsight/insightface"; license = licenses.mit; diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix index 32c69b001249..28d25317afa9 100644 --- a/pkgs/development/python-modules/worldengine/default.nix +++ b/pkgs/development/python-modules/worldengine/default.nix @@ -68,6 +68,7 @@ buildPythonPackage rec { ]; meta = with lib; { + broken = true; homepage = "https://github.com/mindwerks/worldengine"; description = "World generator using simulation of plates, rain shadow, erosion, etc"; license = licenses.mit; From e06224be9b1979f9eb152f2bd9342aaaad76b8a8 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 4 Sep 2023 16:49:10 +0900 Subject: [PATCH 009/134] pdm: 2.8.2 -> 2.9.1 Changelog: https://github.com/pdm-project/pdm/releases/tag/2.9.1 --- pkgs/tools/package-management/pdm/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 41b79f1e0173..15489ce50a99 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , fetchPypi , nix-update-script +, runtimeShell }: let python = python3.override { @@ -30,13 +31,13 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.8.2"; + version = "2.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uUjQC/YgaCsKxMgNIoyzBaKwFQ5JfuaTHaMOPMMFv9w="; + hash = "sha256-/IAU3S/7cnF5qOwCQ8+sntOp3EU0i+HX+X0fKQrWD8s="; }; nativeBuildInputs = [ @@ -83,6 +84,8 @@ buildPythonApplication rec { preCheck = '' export HOME=$TMPDIR + substituteInPlace tests/cli/test_run.py \ + --replace "/bin/bash" "${runtimeShell}" ''; disabledTests = [ From 7964e8a38c95d4ad2c4ec9bbb28508c8442f1d4b Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Mon, 4 Sep 2023 11:18:49 +0200 Subject: [PATCH 010/134] ibis-framework: disable tests broken by pyarrow13 --- .../python-modules/ibis-framework/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 1c5b134ce1ae..16274bc3f00d 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -130,6 +130,19 @@ buildPythonPackage rec { # tries to download duckdb extensions "--deselect=ibis/backends/duckdb/tests/test_register.py::test_register_sqlite" "--deselect=ibis/backends/duckdb/tests/test_register.py::test_read_sqlite" + # pyarrow13 is not supported yet. + "--deselect=ibis/backends/tests/test_temporal.py::test_date_truncate" + "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" + "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" + "--deselect=ibis/backends/tests/test_temporal.py::test_interval_add_cast_column" + "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" + "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" + "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" + "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" + "--deselect=ibis/backends/tests/test_timecontext.py::test_context_adjustment_filter_before_window" + "--deselect=ibis/backends/tests/test_timecontext.py::test_context_adjustment_window_udf" + "--deselect=ibis/backends/tests/test_timecontext.py::test_context_adjustment_window_udf" + "--deselect=ibis/backends/tests/test_aggregation.py::test_aggregate_grouped" ]; # patch out tests that check formatting with black From 9ee9dfac229a2930f13c393c83a67cba5bb19808 Mon Sep 17 00:00:00 2001 From: pennae Date: Mon, 4 Sep 2023 20:20:15 +0200 Subject: [PATCH 011/134] jack-example-tools: init at 4 --- pkgs/misc/jackaudio/tools.nix | 58 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 63 insertions(+) create mode 100644 pkgs/misc/jackaudio/tools.nix diff --git a/pkgs/misc/jackaudio/tools.nix b/pkgs/misc/jackaudio/tools.nix new file mode 100644 index 000000000000..1e3a74e6f6ee --- /dev/null +++ b/pkgs/misc/jackaudio/tools.nix @@ -0,0 +1,58 @@ +{ stdenv +, lib + +, fetchFromGitHub + +, pkg-config +, meson +, ninja + +, jack +, alsa-lib +, libopus +, libsamplerate +, libsndfile +, readline +, zita-alsa-pcmi +, zita-resampler +}: + +stdenv.mkDerivation (final: { + pname = "jack-example-tools"; + version = "4"; + + src = fetchFromGitHub { + owner = "jackaudio"; + repo = "jack-example-tools"; + rev = "tags/${final.version}"; + hash = "sha256-5jmynNxwNVLxEZ1MaqQUG6kRwipDkjhrdDCbZHtmAHk="; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ + jack + alsa-lib + libopus + libsamplerate + libsndfile + readline + zita-alsa-pcmi + zita-resampler + ]; + + postPatch = '' + patchShebangs scripts + ''; + + # no tests defined, but prepare for some in the future. + doCheck = true; + + meta = with lib; { + description = "Official examples and tools from the JACK project"; + homepage = "https://jackaudio.org"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + broken = stdenv.isDarwin; + maintainers = with maintainers; [ pennae ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b10ea04b2b4..804658d92f20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40551,6 +40551,11 @@ with pkgs; libjack2 = jack2.override { prefix = "lib"; }; + jack-example-tools = callPackage ../misc/jackaudio/tools.nix { + libopus = libopus.override { withCustomModes = true; }; + jack = jack2; + }; + jack-autoconnect = libsForQt5.callPackage ../applications/audio/jack-autoconnect { }; jack_autoconnect = jack-autoconnect; From 6e56e31d38828196d67434e73338fa1c658d2ecb Mon Sep 17 00:00:00 2001 From: pennae Date: Mon, 4 Sep 2023 21:06:07 +0200 Subject: [PATCH 012/134] release-notes: add note about jack2 losing its tools let's spare anyone else using these the adventure of finding out why their scripts broke and where the tools went. --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index aa6197039244..4ee8e1432a3e 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -85,6 +85,8 @@ - The `services.ananicy.extraRules` option now has the type of `listOf attrs` instead of `string`. +- JACK tools (`jack_*` except `jack_control`) have moved from the `jack2` package to `jack-example-tools` + - The `matrix-synapse` package & module have undergone some significant internal changes, for most setups no intervention is needed, though: - The option [`services.matrix-synapse.package`](#opt-services.matrix-synapse.package) is now read-only. For modifying the package, use an overlay which modifies `matrix-synapse-unwrapped` instead. More on that below. - The `enableSystemd` & `enableRedis` arguments have been removed and `matrix-synapse` has been renamed to `matrix-synapse-unwrapped`. Also, several optional dependencies (such as `psycopg2` or `authlib`) have been removed. From be69155c3a4f6638cd52edab8d6206805e33d76b Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:21:00 +0200 Subject: [PATCH 013/134] xmlstarlet: add meta.mainProgram --- pkgs/tools/text/xml/xmlstarlet/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index 8f382d3bcd5d..99c97452fe58 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { description = "A command line tool for manipulating and querying XML data"; homepage = "https://xmlstar.sourceforge.net/"; license = lib.licenses.mit; + mainProgram = "xmlstarlet"; platforms = lib.platforms.unix; }; } From 3680de3fc987fa40bf773d66f8c8da77eef89446 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:21:36 +0200 Subject: [PATCH 014/134] tvbrowser: add meta.mainProgram --- pkgs/applications/misc/tvbrowser/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/tvbrowser/default.nix b/pkgs/applications/misc/tvbrowser/default.nix index e3ebd4143e55..83821b29e669 100644 --- a/pkgs/applications/misc/tvbrowser/default.nix +++ b/pkgs/applications/misc/tvbrowser/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode fromSource ]; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "tvbrowser"; maintainers = with maintainers; [ jfrankenau yarny ]; longDescription = '' TV-Browser shows TV program data arranged like in printed From 3aa4d64281537a0cda314b787daecf711ec8d951 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:22:17 +0200 Subject: [PATCH 015/134] expect: add meta.mainProgram --- pkgs/tools/misc/expect/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index bd876371ae26..19ab5158a65b 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -41,6 +41,7 @@ tcl.mkTclDerivation rec { homepage = "https://expect.sourceforge.net/"; license = licenses.publicDomain; platforms = platforms.unix; + mainProgram = "expect"; maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 104d8164f25e514b961eda5755678c077b7419bc Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:10:09 +0200 Subject: [PATCH 016/134] cryptsetup: add meta.mainProgram --- pkgs/os-specific/linux/cryptsetup/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 153719c8b841..5e9e6eca2694 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -78,6 +78,7 @@ stdenv.mkDerivation rec { description = "LUKS for dm-crypt"; changelog = "https://gitlab.com/cryptsetup/cryptsetup/-/raw/v${version}/docs/v${version}-ReleaseNotes"; license = lib.licenses.gpl2; + mainProgram = "cryptsetup"; maintainers = with lib.maintainers; [ raitobezarius ]; platforms = with lib.platforms; linux; }; From 1bb671bd23957221b33d3779575d4eec3cb9e966 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:37:56 +0200 Subject: [PATCH 017/134] betterbird: add meta.mainProgram --- pkgs/applications/networking/mailreaders/betterbird/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix index 9c63f3f37cad..3391e43fd2d1 100644 --- a/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -102,6 +102,7 @@ in ((buildMozillaMach { meta = with lib; { description = "Betterbird is a fine-tuned version of Mozilla Thunderbird, Thunderbird on steroids, if you will"; homepage = "https://www.betterbird.eu/"; + mainProgram = "betterbird"; maintainers = with maintainers; [ SuperSandro2000 ]; inherit (thunderbird-unwrapped.meta) platforms badPlatforms broken license; }; From ff64c702c06f5dfbbc7576912ca64e359a06f642 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:41:13 +0200 Subject: [PATCH 018/134] dnsmasq: add meta.mainProgram --- pkgs/tools/networking/dnsmasq/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 8ca5199838e1..b23753e20412 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -90,6 +90,7 @@ stdenv.mkDerivation rec { description = "An integrated DNS, DHCP and TFTP server for small networks"; homepage = "https://www.thekelleys.org.uk/dnsmasq/doc.html"; license = licenses.gpl2; + mainProgram = "dnsmasq"; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ eelco fpletz globin ]; }; From 47aa9e133189ed0fd656b5c5ef96b04d89146431 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:42:35 +0200 Subject: [PATCH 019/134] dovecot: add meta.mainProgram --- pkgs/servers/mail/dovecot/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 47b6e8571915..92c3d7f47764 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -110,6 +110,7 @@ stdenv.mkDerivation rec { homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; license = with licenses; [ mit publicDomain lgpl21Only bsd3 bsdOriginal ]; + mainProgram = "dovecot"; maintainers = with maintainers; [ fpletz globin ajs124 ]; platforms = platforms.unix; }; From 09ee8956b93f4c5849bcc6157661d76f8de01213 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:43:00 +0200 Subject: [PATCH 020/134] asterisk: add meta.mainProgram --- pkgs/servers/asterisk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 7f4b237e8cd0..15dbfc4cba99 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -156,6 +156,7 @@ let description = "Software implementation of a telephone private branch exchange (PBX)"; homepage = "https://www.asterisk.org/"; license = licenses.gpl2Only; + mainProgram = "asterisk"; maintainers = with maintainers; [ auntie DerTim1 yorickvp ]; }; }; From b6f82dd3c72a9c6088fd51c0993b95e61bce480c Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:46:57 +0200 Subject: [PATCH 021/134] thunderbird{,-bin}: set meta.mainProgram=thunderbird ...also for `thunderbird-bin`, where it previously defaulted to `thunderbird-bin`, which does not exist as binary name. --- .../networking/mailreaders/thunderbird-bin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 6b71de09abee..984881508929 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -213,6 +213,7 @@ stdenv.mkDerivation { changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; description = "Mozilla Thunderbird, a full-featured email client (binary package)"; homepage = "http://www.mozilla.org/thunderbird/"; + mainProgram = "thunderbird"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; maintainers = with lib.maintainers; [ lovesegfault ]; From fca305b300afe2bc75fc17a921191c1be0508ce7 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:53:14 +0200 Subject: [PATCH 022/134] exim: add meta.mainProgram --- pkgs/servers/mail/exim/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 1a911668a540..710a018e3adb 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -122,6 +122,7 @@ stdenv.mkDerivation rec { homepage = "https://exim.org/"; description = "A mail transfer agent (MTA)"; license = with licenses; [ gpl2Plus bsd3 ]; + mainProgram = "exim"; platforms = platforms.linux; maintainers = with maintainers; [ tv ajs124 das_j ]; changelog = "https://github.com/Exim/exim/blob/exim-${version}/doc/doc-txt/ChangeLog"; From 61cc3526368508d05d20a006954a072a430c4c80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Sep 2023 02:44:10 +0000 Subject: [PATCH 023/134] upbound: 0.18.0 -> 0.19.1 --- pkgs/development/tools/upbound/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/upbound/default.nix b/pkgs/development/tools/upbound/default.nix index 301ebdd40885..04b4e45500b5 100644 --- a/pkgs/development/tools/upbound/default.nix +++ b/pkgs/development/tools/upbound/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "upbound"; - version = "0.18.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = pname; repo = "up"; rev = "v${version}"; - sha256 = "sha256-kpk54P9+ITBdlytwxfAhVNTkJN8SReFXgjUdWXclr1I="; + sha256 = "sha256-Dr6EKpKVy2DLhivJ42Bx+WJL2L710sQlXroaAm66Gpo="; }; - vendorHash = "sha256-aqKLWd7C7LLIZm5jSksqp35zWNSYSzTZ8gGHUgWgq9E="; + vendorHash = "sha256-J7rZAvEx0jgkhJIEE19rV2WdBCIvkqYzB72ZiABs56U="; subPackages = [ "cmd/docker-credential-up" "cmd/up" ]; From 057fa9faeef1c0626e28523094ed5663a0405794 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Sep 2023 11:21:02 +0000 Subject: [PATCH 024/134] jellyfin-ffmpeg: 6.0-5 -> 6.0-6 --- pkgs/development/libraries/jellyfin-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index d9064ee85d17..a14a220f5199 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -9,13 +9,13 @@ nv-codec-headers-11 = nv-codec-headers-12; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "6.0-5"; + version = "6.0-6"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-pKmR+IVJAaY91KiboCBkwZleMmMFToez1fW+eXyrZjs="; + sha256 = "sha256-jOKVS+BMADS/jIagOnYwxeGTpTMySmGlOHkPD2LJdkA="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; From 9280ab31fdf039b36715f0d26a2cf5b48a48aa49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Sep 2023 18:39:13 +0000 Subject: [PATCH 025/134] terramate: 0.4.0 -> 0.4.1 --- pkgs/development/tools/misc/terramate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terramate/default.nix b/pkgs/development/tools/misc/terramate/default.nix index c63c2574785d..92de3805149b 100644 --- a/pkgs/development/tools/misc/terramate/default.nix +++ b/pkgs/development/tools/misc/terramate/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "terramate"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${version}"; - hash = "sha256-64tzzruhypIgDbsIOkAenyAYaRnCJiOIiuib3YPI0XI="; + hash = "sha256-bi/O4yG9m8uefY9CSn3yFmotxlFZz53cJG8SI1Zk1/4="; }; - vendorHash = "sha256-/PKibIGNeam6fP2eLUYd2kxlTO4KcboIbUQ2lKe2qYY="; + vendorHash = "sha256-gl5xsaSkGXlh+MfieVBPHGAbYZVF3GBbIkmvVhlJvqw="; # required for version info nativeBuildInputs = [ git ]; From b983f84b1f4d1faa3c972da7433e22bcf54b9435 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Wed, 6 Sep 2023 23:26:59 -0400 Subject: [PATCH 026/134] wine: install in parallel On a 48-thread CPU, this reduced the time of `nix-build -A wineWowPackages.stable` from ~15 min. to ~10 min. --- pkgs/applications/emulators/wine/builder-wow.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/wine/builder-wow.sh b/pkgs/applications/emulators/wine/builder-wow.sh index f07b1e8c249c..7608e5c57eb4 100644 --- a/pkgs/applications/emulators/wine/builder-wow.sh +++ b/pkgs/applications/emulators/wine/builder-wow.sh @@ -45,7 +45,7 @@ buildPhase # checkPhase eval "$preInstall" -cd $TMP/wine-wow && make install -cd $TMP/wine64 && make install +cd $TMP/wine-wow && make install -j$NIX_BUILD_CORES +cd $TMP/wine64 && make install -j$NIX_BUILD_CORES eval "$postInstall" fixupPhase From d986d90a5ee34472e47a3e2fb834516fce241d37 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 7 Sep 2023 13:27:18 +0800 Subject: [PATCH 027/134] bazel-gazelle: 0.32.0 -> 0.33.0 --- pkgs/development/tools/bazel-gazelle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix index e288f5a8eaaf..6687bc2e46ff 100644 --- a/pkgs/development/tools/bazel-gazelle/default.nix +++ b/pkgs/development/tools/bazel-gazelle/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "bazel-gazelle"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LJWL3PWKd6b+tNGFX5H2Hd7HNEtYh1pVtZhwDJNzhV0="; + hash = "sha256-WmDtMOEs7cOb/juWTHjkc8/92f2OL0vurMMM15IE3YI="; }; vendorHash = null; From 84e0ab64db497118126ee7c3c478d3be65598a77 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 7 Sep 2023 13:43:25 +0800 Subject: [PATCH 028/134] micro: 2.0.11 -> 2.0.12 --- pkgs/applications/editors/micro/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index d4dbb4d97cca..964c81a6c424 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "micro"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "zyedidia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3Rppi8UcAc4zdXOd81Y+sb5Psezx2TQsNw73WdPVMgE="; + hash = "sha256-L8yJE3rjNcx+1gawQ8urZcFfoQdO20E67mJQjWaVwVo="; }; + vendorHash = "sha256-h00s+xqepj+odKAgf54s35xMnnj3gtx5LWDOYFx5GY0="; + nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/micro" ]; - vendorSha256 = "sha256-/bWIn5joZOTOtuAbljOc0NgBfjrFkbFZih+cPNHnS9w="; - ldflags = let t = "github.com/zyedidia/micro/v2/internal"; in [ "-s" "-w" @@ -34,7 +34,7 @@ buildGoModule rec { install -Dm644 assets/micro-logo-mark.svg $out/share/icons/hicolor/scalable/apps/micro.svg ''; - passthru.tests.expect = callPackage ./test-with-expect.nix {}; + passthru.tests.expect = callPackage ./test-with-expect.nix { }; meta = with lib; { homepage = "https://micro-editor.github.io"; From b352ab677bec91506b43c5455153cb555e6631ad Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 7 Sep 2023 13:08:00 +0200 Subject: [PATCH 029/134] neovim: 0.9.1 -> 0.9.2 --- pkgs/applications/editors/neovim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 15b9d0ba80b9..9bf6fb51bdff 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - hash = "sha256-G51qD7GklEn0JrneKSSqDDx0Odi7W2FjdQc0ZDE9ZK4="; + hash = "sha256-kKstlq1BzoBAy+gy9iL1auRViJ223cVpAt5X7pUWT1U="; }; patches = [ From df53ba2ca036dda30f3736ee6dbed79a18226800 Mon Sep 17 00:00:00 2001 From: traxys Date: Sat, 19 Aug 2023 10:30:30 +0200 Subject: [PATCH 030/134] python310Packages.cssbeautifier: init at 1.14.9 --- .../python-modules/cssbeautifier/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/cssbeautifier/default.nix diff --git a/pkgs/development/python-modules/cssbeautifier/default.nix b/pkgs/development/python-modules/cssbeautifier/default.nix new file mode 100644 index 000000000000..390c459242ae --- /dev/null +++ b/pkgs/development/python-modules/cssbeautifier/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, jsbeautifier +}: + +buildPythonPackage rec { + pname = "cssbeautifier"; + version = "1.14.9"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LaQyRy9oFw64VK/5exaiRyH1CQ7javLjEZlZConn9x8="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ jsbeautifier ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "cssbeautifier" ]; + + meta = with lib; { + description = "CSS unobfuscator and beautifier"; + homepage = "https://pypi.org/project/cssbeautifier/"; + license = licenses.mit; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 241fcb19ad61..24878a3c70f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2331,6 +2331,8 @@ self: super: with self; { csrmesh = callPackage ../development/python-modules/csrmesh { }; + cssbeautifier = callPackage ../development/python-modules/cssbeautifier { }; + csscompressor = callPackage ../development/python-modules/csscompressor { }; cssmin = callPackage ../development/python-modules/cssmin { }; From dcf69ccc4fb9ede3c8e815119dd45579962c06cd Mon Sep 17 00:00:00 2001 From: traxys Date: Sat, 19 Aug 2023 10:43:01 +0200 Subject: [PATCH 031/134] python310Packages.html-tag-names: init at 0.1.2 --- .../python-modules/html-tag-names/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/html-tag-names/default.nix diff --git a/pkgs/development/python-modules/html-tag-names/default.nix b/pkgs/development/python-modules/html-tag-names/default.nix new file mode 100644 index 000000000000..543ef8686dc9 --- /dev/null +++ b/pkgs/development/python-modules/html-tag-names/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +}: + +buildPythonPackage rec { + pname = "html-tag-names"; + version = "0.1.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Riverside-Healthcare"; + repo = "html-tag-names"; + rev = version; + hash = "sha256-2YywP4/0yocejuJwanC5g9BR7mcy5C+zMhCjNZ9FRH4="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "HtmlTagNames" ]; + + meta = with lib; { + description = "List of known HTML tags"; + homepage = "https://github.com/Riverside-Healthcare/html-tag-names"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 24878a3c70f1..a8d31fb8c712 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4944,6 +4944,8 @@ self: super: with self; { html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; + html-tag-names = callPackage ../development/python-modules/html-tag-names { }; + html-text = callPackage ../development/python-modules/html-text { }; htseq = callPackage ../development/python-modules/htseq { }; From cb936ef04107de448bf96d82c70ec255e0f8e4e8 Mon Sep 17 00:00:00 2001 From: traxys Date: Sat, 19 Aug 2023 10:49:49 +0200 Subject: [PATCH 032/134] python310Packages.html-void-elements: init at 0.1.0 --- .../html-void-elements/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/html-void-elements/default.nix diff --git a/pkgs/development/python-modules/html-void-elements/default.nix b/pkgs/development/python-modules/html-void-elements/default.nix new file mode 100644 index 000000000000..bef3d9208026 --- /dev/null +++ b/pkgs/development/python-modules/html-void-elements/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +}: + +buildPythonPackage rec { + pname = "html-void-elements"; + version = "0.1.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Riverside-Healthcare"; + repo = "html-void-elements"; + rev = version; + hash = "sha256-Q5OEczTdgCCyoOsKv3MKRE3w4t/qyPG4YKbF19jlC88="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "HtmlVoidElements" ]; + + meta = with lib; { + description = "List of HTML void tag names"; + homepage = "https://github.com/Riverside-Healthcare/html-void-elements"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8d31fb8c712..147ae2f425a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4948,6 +4948,8 @@ self: super: with self; { html-text = callPackage ../development/python-modules/html-text { }; + html-void-elements = callPackage ../development/python-modules/html-void-elements { }; + htseq = callPackage ../development/python-modules/htseq { }; httmock = callPackage ../development/python-modules/httmock { }; From 08d84537592bd541e78622d2101050f9409ef562 Mon Sep 17 00:00:00 2001 From: traxys Date: Sat, 19 Aug 2023 10:24:07 +0200 Subject: [PATCH 033/134] djlint: init at 1.32.1 --- pkgs/development/tools/djlint/default.nix | 45 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/tools/djlint/default.nix diff --git a/pkgs/development/tools/djlint/default.nix b/pkgs/development/tools/djlint/default.nix new file mode 100644 index 000000000000..ba3e5606d095 --- /dev/null +++ b/pkgs/development/tools/djlint/default.nix @@ -0,0 +1,45 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "djlint"; + version = "1.32.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Riverside-Healthcare"; + repo = "djlint"; + rev = "v${version}"; + hash = "sha256-///ZEkVohioloBJn6kxpEK5wmCzMp9ZYeAH1mONOA0E="; + }; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + colorama + cssbeautifier + html-tag-names + html-void-elements + jsbeautifier + json5 + pathspec + pyyaml + regex + tomli + tqdm + ]; + + pythonImportsCheck = [ "djlint" ]; + + meta = with lib; { + description = "HTML Template Linter and Formatter. Django - Jinja - Nunjucks - Handlebars - GoLang"; + homepage = "https://github.com/Riverside-Healthcare/djlint"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c43fb7f893bb..e23bbd66e584 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17363,6 +17363,8 @@ with pkgs; devspace = callPackage ../development/tools/misc/devspace { }; + djlint = callPackage ../development/tools/djlint { }; + leptosfmt = callPackage ../development/tools/rust/leptosfmt { }; maturin = callPackage ../development/tools/rust/maturin { From abe4d9830fd29c10e49ffc05bc6b3058dae32f39 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 7 Sep 2023 12:51:04 -0400 Subject: [PATCH 034/134] ttop: 1.2.2 -> 1.2.3 Diff: https://github.com/inv2004/ttop/compare/v1.2.2...v1.2.3 Changelog: https://github.com/inv2004/ttop/releases/tag/v1.2.3 --- pkgs/tools/system/ttop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ttop/default.nix b/pkgs/tools/system/ttop/default.nix index e740ac15bb19..c09f028d006e 100644 --- a/pkgs/tools/system/ttop/default.nix +++ b/pkgs/tools/system/ttop/default.nix @@ -2,14 +2,14 @@ nimPackages.buildNimPackage (finalAttrs: { pname = "ttop"; - version = "1.2.2"; + version = "1.2.3"; nimBinOnly = true; src = fetchFromGitHub { owner = "inv2004"; repo = "ttop"; rev = "v${finalAttrs.version}"; - hash = "sha256-sXhyDIQ2gaQhy3EF4Kex2XgE3RvTJyu/iY8e66N4ZJk="; + hash = "sha256-YrPlE+vCA1ffV1y9QCh2W66L78HZfDRbGOflkwWLqGA="; }; buildInputs = with nimPackages; [ asciigraph illwill jsony parsetoml zippy ]; From e55c80af27282a37feb886e2a99f92ac898c3f7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Sep 2023 22:45:30 +0000 Subject: [PATCH 035/134] python310Packages.snowflake-connector-python: 3.1.1 -> 3.2.0 --- .../python-modules/snowflake-connector-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index c72b715fbb59..741ef59f26da 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.1.1"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JwBQOl+Z1uIuQS189P0iESlswOULKjitnG9I3bi+/2c="; + hash = "sha256-Z2oNyhbefBIJAKoaX85kQIM7CmD3ZoK3zPFmeWcoLKM="; }; # snowflake-connector-python requires arrow 10.0.1, which we don't have in From a26de14753637e131685fd1913096113bd20d72f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Sep 2023 00:04:58 +0200 Subject: [PATCH 036/134] python311Packages.aemet-opendata: 0.2.2 -> 0.4.4 (#251325) * python311Packages.aemet-opendata: add changelog to meta * python311Packages.aemet-opendata: 0.2.2 -> 0.3.0 Diff: https://github.com/Noltari/AEMET-OpenData/compare/refs/tags/0.2.2...0.3.0 Changelog: https://github.com/Noltari/AEMET-OpenData/releases/tag/0.3.0 * python311Packages.aemet-opendata: 0.3.0 -> 0.4.3 Diff: https://github.com/Noltari/AEMET-OpenData/compare/refs/tags/0.3.0...0.4.3 Changelog: https://github.com/Noltari/AEMET-OpenData/releases/tag/0.4.3 * python311Packages.aemet-opendata: 0.4.3 -> 0.4.4 Diff: https://github.com/Noltari/AEMET-OpenData/compare/refs/tags/0.4.3...0.4.4 Changelog: https://github.com/Noltari/AEMET-OpenData/releases/tag/0.4.4 --- .../python-modules/aemet-opendata/default.nix | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aemet-opendata/default.nix b/pkgs/development/python-modules/aemet-opendata/default.nix index 64e3cfa7b032..90f28265c090 100644 --- a/pkgs/development/python-modules/aemet-opendata/default.nix +++ b/pkgs/development/python-modules/aemet-opendata/default.nix @@ -1,26 +1,36 @@ { lib +, aiohttp , buildPythonPackage -, pythonOlder , fetchFromGitHub , geopy +, pythonOlder , requests +, setuptools , urllib3 +, wheel }: buildPythonPackage rec { pname = "aemet-opendata"; - version = "0.2.2"; + version = "0.4.4"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Noltari"; repo = "AEMET-OpenData"; rev = "refs/tags/${version}"; - hash = "sha256-3f3hvui00oItu6t9rKecoCquqsD1Eeqz+SEsLBqGt48="; + hash = "sha256-Jm7fv1fNavp2GkfKPhZXYGnGuCBy6BdN9iTNYTBIyew="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ + aiohttp geopy requests urllib3 @@ -29,11 +39,14 @@ buildPythonPackage rec { # no tests implemented doCheck = false; - pythonImportsCheck = [ "aemet_opendata.interface" ]; + pythonImportsCheck = [ + "aemet_opendata.interface" + ]; meta = with lib; { description = "Python client for AEMET OpenData Rest API"; homepage = "https://github.com/Noltari/AEMET-OpenData"; + changelog = "https://github.com/Noltari/AEMET-OpenData/releases/tag/${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ dotlambda ]; }; From 51f25f51fe038a90288cfbca370cec12997ce35b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Sep 2023 00:05:47 +0200 Subject: [PATCH 037/134] python311Packages.aioairzone: 0.6.7 -> 0.6.8 (#253489) Diff: https://github.com/Noltari/aioairzone/compare/refs/tags/0.6.7...0.6.8 Changelog: https://github.com/Noltari/aioairzone/releases/tag/0.6.8 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 2ea2137f0405..ac094571d087 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.6.7"; + version = "0.6.8"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/LUTHeApktB4okt9bVkZe7G1dApVaYUdwty4sbK7IKQ="; + hash = "sha256-aCf0IO70t/QMmDmIwBKN3Um1HgHjHn1r6Dze/pWaQ5M="; }; nativeBuildInputs = [ From 5129792275086d46968d064ea246f31ee6bc9bb3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Sep 2023 00:09:12 +0200 Subject: [PATCH 038/134] python311Packages.aioesphomeapi: 16.0.3 -> 16.0.5 https://github.com/esphome/aioesphomeapi/releases/tag/v16.0.5 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index cc34f91fde9d..f0a310b7a14c 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "16.0.3"; + version = "16.0.5"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x4kH8riHZbVibgwR2DmWB4tsswpub4m2LwnypVVUgqM="; + hash = "sha256-SueK59CZTKkQPsHThs7k9eCEmc1GwaRIrw3oSK4E80E="; }; propagatedBuildInputs = [ From 73052ba9249659ea29aadc215b313cca26c6040a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Sep 2023 00:20:50 +0200 Subject: [PATCH 039/134] python311Packages.aiolyric: 1.0.10 -> 1.1.0 https://github.com/timmo001/aiolyric/releases/tag/v1.1.0 --- pkgs/development/python-modules/aiolyric/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix index ba0b17a5eb58..b6346a511aa5 100644 --- a/pkgs/development/python-modules/aiolyric/default.nix +++ b/pkgs/development/python-modules/aiolyric/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiolyric"; - version = "1.0.10"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "timmo001"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yKeG0UCQ8haT1hvywoIwKQ519GK2wFg0wXaRTFeKYIk="; + hash = "sha256-LDLpNuwkoPacI/a2NSlqUABRgwy+jAjGwOxmShLskso="; }; propagatedBuildInputs = [ @@ -29,8 +29,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # AssertionError, https://github.com/timmo001/aiolyric/issues/5 - "test_location" + # AssertionError, https://github.com/timmo001/aiolyric/issues/61 + "test_priority" ]; pythonImportsCheck = [ From 5fd9190d3b99910b3c5ac11ffbd1c8c7517d665f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Aug 2023 09:56:59 +0200 Subject: [PATCH 040/134] python311Packages.aioshelly: 5.4.0 -> 6.0.0 Diff: https://github.com/home-assistant-libs/aioshelly/compare/refs/tags/5.4.0...6.0.0 Changelog: https://github.com/home-assistant-libs/aioshelly/releases/tag/6.0.0 --- pkgs/development/python-modules/aioshelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index d00469ecb099..b47936c926d3 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "5.4.0"; + version = "6.0.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-cbgDuJXvZmbhIgxpuySGbJqz7DeI65DHwk1UPdNUs1Q="; + hash = "sha256-mB9BEVqbHcoUaygIgrtqk20wMJkL+dWpbeyG5VP4+sg="; }; propagatedBuildInputs = [ From 83659c7c6eb4afdc3ab312aa51283717d329cf53 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Sep 2023 00:30:33 +0200 Subject: [PATCH 041/134] python311Packages.aiounifi: 61 -> 61 https://github.com/Kane610/aiounifi/releases/tag/v61 --- .../python-modules/aiounifi/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 09b177a61bf7..45591837df44 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aioresponses -, async-timeout , buildPythonPackage , fetchFromGitHub , orjson @@ -10,25 +9,39 @@ , pytestCheckHook , pythonOlder , segno +, setuptools +, wheel }: buildPythonPackage rec { pname = "aiounifi"; - version = "55"; - format = "setuptools"; + version = "61"; + format = "pyproject"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JvuP1Rhq01Y9KbfAJpawUQNWfxvlf9LY82RvXok4tgw="; + hash = "sha256-tzP20KDPCq1/fJY+OfEpo3LMbP662ROh2aPI4nmDp0Y="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools==" "setuptools>=" \ + --replace "wheel==" "wheel>=" + + sed -i '/--cov=/d' pyproject.toml + ''; + + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ aiohttp - async-timeout orjson segno ]; From 31b59a1fc08bc535d691fe62cd9e7069fc1b7de4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Aug 2023 21:46:59 +0200 Subject: [PATCH 042/134] python311Packages.hatasmota: 0.6.5 -> 0.7.0 Diff: https://github.com/emontnemery/hatasmota/compare/refs/tags/0.6.5...0.7.0 Changelog: https://github.com/emontnemery/hatasmota/releases/tag/0.7.0 --- pkgs/development/python-modules/hatasmota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index 1491587ade27..3fa3546eb976 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.6.5"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DqXGvn7vYC3SXOM/u+nMUshgBUe0O6Dcffaxh9vFohk="; + hash = "sha256-f8bRVo9365w5gMpkb31thGXCRWZuKfkFEow9Wv4/+bM="; }; propagatedBuildInputs = [ From 18a30be86a903cdf73eab74f3679a2c50913b918 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Sep 2023 12:49:23 +0200 Subject: [PATCH 043/134] python311Packages.pymodbus: 3.3.2 -> 3.5.0 https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.4.0 https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.4.1 https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.5.0 --- .../python-modules/pymodbus/default.nix | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index c1b1b75d284c..d4715c131cea 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -7,54 +7,57 @@ , prompt-toolkit , pygments , pyserial -, pyserial-asyncio , pytest-asyncio -, pytest-rerunfailures , pytest-xdist , pytestCheckHook , redis , sqlalchemy -, tornado , twisted +, typer }: buildPythonPackage rec { pname = "pymodbus"; - version = "3.3.2"; + version = "3.5.0"; format = "setuptools"; src = fetchFromGitHub { owner = "pymodbus-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EGJyb0AVLKN7FEoeWF4rVqmJBNbXHent9P+cxc13rQs="; + hash = "sha256-ZoGpMhJng46nW7v/QgjGCsFZV6xV4PSh9/DH1d2dzdg="; }; - # Twisted asynchronous version is not supported due to a missing dependency - propagatedBuildInputs = [ - aiohttp - click - prompt-toolkit - pygments - pyserial - pyserial-asyncio - tornado - ]; + passthru.optional-dependencies = { + repl = [ + aiohttp + typer + prompt-toolkit + pygments + click + ] ++ typer.optional-dependencies.all; + serial = [ + pyserial + ]; + }; nativeCheckInputs = [ mock pytest-asyncio - pytest-rerunfailures pytest-xdist pytestCheckHook redis sqlalchemy twisted - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pytestFlagsArray = [ - "--reruns" "3" # Racy socket tests - ]; + preCheck = '' + pushd test + ''; + + postCheck = '' + popd + ''; pythonImportsCheck = [ "pymodbus" ]; From f3cf0585eb928af7971cb297f4d1b4eb25310b9f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Sep 2023 12:57:50 +0200 Subject: [PATCH 044/134] python311Packages.aiotractive: 0.5.5 -> 0.5.6 https://github.com/zhulik/aiotractive/releases/tag/v0.5.6 --- pkgs/development/python-modules/aiotractive/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix index a39130c383a3..5891fa703a90 100644 --- a/pkgs/development/python-modules/aiotractive/default.nix +++ b/pkgs/development/python-modules/aiotractive/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiotractive"; - version = "0.5.5"; + version = "0.5.6"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zhulik"; repo = pname; rev = "v${version}"; - hash = "sha256-VCwIAeSAN4tMwB8TXN/ukrws0qYv/jHHeEu++m56AHA="; + hash = "sha256-jJw1L1++Z/r+E12tA6zoyyy4MmTpaaVVzKwfI6xcDBQ="; }; propagatedBuildInputs = [ @@ -29,6 +29,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiotractive" ]; meta = with lib; { + changelog = "https://github.com/zhulik/aiotractive/releases/tag/v${version}"; description = "Python client for the Tractive REST API"; homepage = "https://github.com/zhulik/aiotractive"; license = licenses.mit; From 9187dc141c8cfd9913818e9085bc4bcad3972699 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Aug 2023 19:19:26 +0200 Subject: [PATCH 045/134] python311Packages.python-bsblan: 0.5.15 -> 0.5.16 Diff: https://github.com/liudger/python-bsblan/compare/refs/tags/v0.5.15...v0.5.16 Changelog: https://github.com/liudger/python-bsblan/releases/tag/v0.5.16 --- pkgs/development/python-modules/python-bsblan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 10db66e4bb22..2ffc8ed0b7f2 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.5.15"; + version = "0.5.16"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "liudger"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PNgv3QXl3iyDX0KOn1egQrt6D64i3eCUyCPtXe94y0U="; + hash = "sha256-m80lnNd1ANddV0d/w3S7+QWzIPRklDZsWMO2g1hgEoQ="; }; postPatch = '' From 1028115c8e0dfb0cfd1b5cbb9a44a75680c0b264 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Sep 2023 13:01:23 +0200 Subject: [PATCH 046/134] python311Packages.reolink-aio: 0.7.8 -> 0.7.9 https://github.com/starkillerOG/reolink_aio/releases/tag/0.7.9 --- .../python-modules/reolink-aio/default.nix | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index b74665e2c342..758c957823a6 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -2,15 +2,14 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, ffmpeg-python , orjson , pythonOlder -, requests +, typing-extensions }: buildPythonPackage rec { pname = "reolink-aio"; - version = "0.7.8"; + version = "0.7.9"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,29 +18,22 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-vbSt1rD25Bt3Qac0uO0Z63JhbU5HU0p2ox046W6xyJU="; + hash = "sha256-+1FZzgVaj2hphSTFlOtaYH3o++kC/aaahU8i8urdme0="; }; - postPatch = '' - # Packages in nixpkgs is different than the module name - substituteInPlace setup.py \ - --replace "ffmpeg" "ffmpeg-python" - ''; - propagatedBuildInputs = [ aiohttp - ffmpeg-python orjson - requests + typing-extensions ]; - # All tests require a network device - doCheck = false; - pythonImportsCheck = [ "reolink_aio" ]; + # All tests require a network device + doCheck = false; + meta = with lib; { description = "Module to interact with the Reolink IP camera API"; homepage = "https://github.com/starkillerOG/reolink_aio"; From 0ae97cda12672463103fa49fbd539152b94c0abd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Sep 2023 13:04:12 +0200 Subject: [PATCH 047/134] python311Packages.zwave-js-server-python: 0.49.0 -> 0.51.1 https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/0.51.1 --- .../python-modules/zwave-js-server-python/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 7c9de5a6fbef..3669f6c70f1f 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.49.0"; + version = "0.51.1"; format = "setuptools"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6CN2Smwm693RUuRUdqrNKa7j2I3pjmR+QoPfpjti+h8="; + hash = "sha256-2U0mRlNUCZD05lgGB3dz2WaUxG2dv/C7nxD2sI3R8B8="; }; propagatedBuildInputs = [ @@ -27,8 +27,6 @@ buildPythonPackage rec { pydantic ]; - doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; - nativeCheckInputs = [ pytest-aiohttp pytestCheckHook From 3734044c2d048fa7bda10ddd6ef0528d818a696b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Sep 2023 12:50:56 +0200 Subject: [PATCH 048/134] python311Packages.aiocomelit: init at 0.0.6 --- .../python-modules/aiocomelit/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/aiocomelit/default.nix diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix new file mode 100644 index 000000000000..dd572da52210 --- /dev/null +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -0,0 +1,52 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiocomelit"; + version = "0.0.6"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "chemelli74"; + repo = "aiocomelit"; + rev = "refs/tags/v${version}"; + hash = "sha256-u6CyqDFLgnIVak0UqN4JmL8ll/li3k9EhFs7iC5oZ9U="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=aiocomelit --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiocomelit" + ]; + + meta = with lib; { + description = "Library to control Comelit Simplehome"; + homepage = "https://github.com/chemelli74/aiocomelit"; + changelog = "https://github.com/chemelli74/aiocomelit/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 241fcb19ad61..fc73ac4dd6b0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -172,6 +172,8 @@ self: super: with self; { aiocoap = callPackage ../development/python-modules/aiocoap { }; + aiocomelit = callPackage ../development/python-modules/aiocomelit { }; + aioconsole = callPackage ../development/python-modules/aioconsole { }; aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; From 5646d24e0c5df907b8797a49f741861dee6ff3bc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Sep 2023 13:06:00 +0200 Subject: [PATCH 049/134] python311Packages.aiovodafone: init at 0.0.8 --- .../python-modules/aiovodafone/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/aiovodafone/default.nix diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix new file mode 100644 index 000000000000..f0ad237f9208 --- /dev/null +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -0,0 +1,54 @@ +{ lib +, aiohttp +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiovodafone"; + version = "0.0.8"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "chemelli74"; + repo = "aiovodafone"; + rev = "refs/tags/v${version}"; + hash = "sha256-o21zaK3dJfURFAt8fPaOd95H7tuqLnFPC01RGHBIz4M="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=aiovodafone --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + beautifulsoup4 + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiovodafone" + ]; + + meta = with lib; { + description = "Library to control Vodafon Station"; + homepage = "https://github.com/chemelli74/aiovodafone"; + changelog = "https://github.com/chemelli74/aiovodafone/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc73ac4dd6b0..94b3934988e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -396,6 +396,8 @@ self: super: with self; { aiovlc = callPackage ../development/python-modules/aiovlc { }; + aiovodafone = callPackage ../development/python-modules/aiovodafone { }; + aiowatttime = callPackage ../development/python-modules/aiowatttime { }; aioweenect = callPackage ../development/python-modules/aioweenect { }; From ee9e52a52ea4b1987ea03f7217c3e65b6e616c1c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Sep 2023 13:21:54 +0200 Subject: [PATCH 050/134] python311Packages.universal-silabs-flasher: init at 0.0.13 https://github.com/NabuCasa/universal-silabs-flasher --- .../universal-silabs-flasher/default.nix | 73 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/development/python-modules/universal-silabs-flasher/default.nix diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix new file mode 100644 index 000000000000..348fa01ffbe1 --- /dev/null +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools +, setuptools-git-versioning +, wheel + +# dependencies +, async-timeout +, bellows +, click +, coloredlogs +, crc +, libgpiod +, typing-extensions +, zigpy + +# tests +, pytestCheckHook +, pytest-asyncio +, pytest-mock +, pytest-timeout +}: + +buildPythonPackage rec { + pname = "universal-silabs-flasher"; + version = "0.0.13"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "NabuCasa"; + repo = "universal-silabs-flasher"; + rev = "v${version}"; + hash = "sha256-qiaDPCnVb6JQ2fZRFK+QF4o8K2UbIWGNKl5oo6MQUW0="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-git-versioning + wheel + ]; + + propagatedBuildInputs = [ + async-timeout + bellows + click + coloredlogs + crc + typing-extensions + zigpy + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ + libgpiod + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pytest-mock + pytest-timeout + ]; + + pythonImportsCheck = [ "universal_silabs_flasher" ]; + + meta = with lib; { + description = "Flashes Silicon Labs radios running EmberZNet or CPC multi-pan firmware"; + homepage = "https://github.com/NabuCasa/universal-silabs-flasher"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 94b3934988e1..120aa81c96ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13386,6 +13386,8 @@ self: super: with self; { universal-pathlib = callPackage ../development/python-modules/universal-pathlib { }; + universal-silabs-flasher = callPackage ../development/python-modules/universal-silabs-flasher { }; + unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { }; unrardll = callPackage ../development/python-modules/unrardll { }; From c1985b815f3ac2cb411567a184beb6fd73ab442f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Sep 2023 15:26:31 +0200 Subject: [PATCH 051/134] python311Packages.aioruckus: init at 0.34 --- .../python-modules/aioruckus/default.nix | 67 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/development/python-modules/aioruckus/default.nix diff --git a/pkgs/development/python-modules/aioruckus/default.nix b/pkgs/development/python-modules/aioruckus/default.nix new file mode 100644 index 000000000000..a3d77994f432 --- /dev/null +++ b/pkgs/development/python-modules/aioruckus/default.nix @@ -0,0 +1,67 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +, wheel +, xmltodict +}: + +buildPythonPackage rec { + pname = "aioruckus"; + version = "0.34"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "ms264556"; + repo = "aioruckus"; + rev = "refs/tags/v${version}"; + hash = "sha256-SPj1w1jAJFBsWj1+N8srAbvlh+yB3ZTT7aDcZTnmUto="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools>=68.1" "setuptools" + ''; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + aiohttp + xmltodict + ]; + + pythonImportsCheck = [ + "aioruckus" + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # these require a local ruckus device + "test_ap_info" + "test_authentication_error" + "test_connect_success" + "test_current_active_clients" + "test_mesh_info" + "test_system_info" + ]; + + meta = with lib; { + description = "Python client for Ruckus Unleashed and Ruckus ZoneDirector"; + homepage = "https://github.com/ms264556/aioruckus"; + license = licenses.bsd0; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 120aa81c96ed..ce9c0e6a0371 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -346,6 +346,8 @@ self: super: with self; { aiortm = callPackage ../development/python-modules/aiortm { }; + aioruckus = callPackage ../development/python-modules/aioruckus { }; + aiorun = callPackage ../development/python-modules/aiorun { }; aioruuvigateway = callPackage ../development/python-modules/aioruuvigateway { }; From f2e1a4b0cdab05a2744a3e44ee1675f077167b9c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Sep 2023 15:23:49 +0200 Subject: [PATCH 052/134] python311Packages.aiowaqi: init at 1.1.0 https://github.com/joostlek/python-waqi --- .../python-modules/aiowaqi/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/aiowaqi/default.nix diff --git a/pkgs/development/python-modules/aiowaqi/default.nix b/pkgs/development/python-modules/aiowaqi/default.nix new file mode 100644 index 000000000000..ba2d16c7e3e9 --- /dev/null +++ b/pkgs/development/python-modules/aiowaqi/default.nix @@ -0,0 +1,60 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, syrupy +, yarl +}: + +buildPythonPackage rec { + pname = "aiowaqi"; + version = "1.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "joostlek"; + repo = "python-waqi"; + rev = "refs/tags/v${version}"; + hash = "sha256-CQCF59Tp0VE7PNHPdVzzZegLUNDkslzKapELDjZn1k4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + syrupy + ]; + + pythonImportsCheck = [ + "aiowaqi" + ]; + + meta = with lib; { + description = "Module to interact with the WAQI API"; + homepage = "https://github.com/joostlek/python-waqi"; + changelog = "https://github.com/joostlek/python-waqi/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ce9c0e6a0371..d944f1c7c959 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -402,6 +402,8 @@ self: super: with self; { aiowatttime = callPackage ../development/python-modules/aiowatttime { }; + aiowaqi = callPackage ../development/python-modules/aiowaqi { }; + aioweenect = callPackage ../development/python-modules/aioweenect { }; aiowebostv = callPackage ../development/python-modules/aiowebostv { }; From c5c4ba3280302d83f62efd8da21f9065d4396be6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Sep 2023 15:45:16 +0200 Subject: [PATCH 053/134] python311Packages.pywaze: init at 0.3.0 --- .../python-modules/pywaze/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/pywaze/default.nix diff --git a/pkgs/development/python-modules/pywaze/default.nix b/pkgs/development/python-modules/pywaze/default.nix new file mode 100644 index 000000000000..fbaa0e94ea87 --- /dev/null +++ b/pkgs/development/python-modules/pywaze/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, httpx +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, respx +}: + +buildPythonPackage rec { + pname = "pywaze"; + version = "0.3.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "eifinger"; + repo = "pywaze"; + rev = "refs/tags/v${version}"; + hash = "sha256-z/6eSgERHKV/5vjbRWcyrxAMNDIHvM3GUoo3xf+AhNY="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov --cov-report term-missing --cov=src/pywaze " "" + ''; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + httpx + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + respx + ]; + + pythonImportsCheck = [ + "pywaze" + ]; + + meta = with lib; { + description = "Module for calculating WAZE routes and travel times"; + homepage = "https://github.com/eifinger/pywaze"; + changelog = "https://github.com/eifinger/pywaze/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d944f1c7c959..d014c1d19e5c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10788,6 +10788,8 @@ self: super: with self; { pywayland = callPackage ../development/python-modules/pywayland { }; + pywaze = callPackage ../development/python-modules/pywaze { }; + pywbem = callPackage ../development/python-modules/pywbem { inherit (pkgs) libxml2; }; From e4110a5ebf50ba1f9fa6397b83db986de84350fb Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 8 Sep 2023 02:56:23 +0200 Subject: [PATCH 054/134] figma-linux: Add missing wrapGAppsHook --- pkgs/applications/graphics/figma-linux/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/figma-linux/default.nix b/pkgs/applications/graphics/figma-linux/default.nix index 1afc65ea0fc1..9f6407f71739 100644 --- a/pkgs/applications/graphics/figma-linux/default.nix +++ b/pkgs/applications/graphics/figma-linux/default.nix @@ -4,6 +4,7 @@ , fetchurl , autoPatchelfHook , dpkg +, wrapGAppsHook , ... }: with lib; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-+xiXEwSSxpt1/Eu9g57/L+Il/Av+a/mgGBQl/4LKR74="; }; - nativeBuildInputs = [ autoPatchelfHook dpkg ]; + nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; buildInputs = with pkgs;[ alsa-lib From 1a25f677044bd036ccd2edcdbdfe81f5dbf3fa92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 01:09:52 +0000 Subject: [PATCH 055/134] tagparser: 12.0.0 -> 12.1.0 --- pkgs/development/libraries/tagparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tagparser/default.nix b/pkgs/development/libraries/tagparser/default.nix index 7f534979c978..c0f6f3fd42b4 100644 --- a/pkgs/development/libraries/tagparser/default.nix +++ b/pkgs/development/libraries/tagparser/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "tagparser"; - version = "12.0.0"; + version = "12.1.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; rev = "v${version}"; - hash = "sha256-b6nAVhakQA8oKHP48+1S+4SX6EcI0kxK8uXTZ05cLnQ="; + hash = "sha256-83Xxj1CQsghbAsQ/3GKIYCz9lBNEBvLlx1iOKbszn8A="; }; nativeBuildInputs = [ cmake ]; From cb1d6c17a3b0325a1a564fac31dd61078afcf337 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 01:35:14 +0000 Subject: [PATCH 056/134] zef: 0.18.3 -> 0.19.1 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 103f5c5afa8e..4b0d0388466c 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.18.3"; + version = "0.19.1"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-/H8wHDMl2lJElsjNcNmTrijIeL1ohOkDzrO7LuOPhi4="; + sha256 = "sha256-tA3BH8YlOHCcbYht2mnZr05vtUfeHn6LGB5Hrylbrpw="; }; nativeBuildInputs = [ makeWrapper ]; From bf68b20e5654c19489aa39d9bbf73ff92e6edd19 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 8 Sep 2023 10:35:51 +0800 Subject: [PATCH 057/134] tfsec: 1.28.1 -> 1.28.2 --- pkgs/development/tools/analysis/tfsec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 1127e6323de5..dd80de382475 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.28.1"; + version = "1.28.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - hash = "sha256-44DN3lV9BLBFr6kkD3IcamQg+t+xUqqao83f0nBKZvI="; + hash = "sha256-N1BL0DHppHyfxHQT98y3rtvyCArq/bcbDIiB0NxCsJA="; }; ldflags = [ @@ -22,7 +22,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorSha256 = "sha256-NQUDeNAWSWcIoSZjdbaFQTB3nMFGbLZLUDNFHMk6Enw="; + vendorHash = "sha256-7OTMJhW1Q1z/TOFa4oRCEIPF0cN8gZLdaQglqszXHdw="; subPackages = [ "cmd/tfsec" From 6bcca55e0cf2e6ca52f19acf9b77fc2ac30044c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 02:46:16 +0000 Subject: [PATCH 058/134] python310Packages.adafruit-platformdetect: 3.49.0 -> 3.51.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index d9fe80fcba4f..0bb566508b34 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.49.0"; + version = "3.51.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-bLwPnKLOdk8scKF4hQgkBXRoz0Ph6/pcRLlJdN+cDoA="; + hash = "sha256-/a0IKOFWnXC6BJItpJDqiA9aCB1PNhglNlB/4KvyQdg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 2bd2252183593fefdbadf4aeed1cbadcafb135ca Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Thu, 7 Sep 2023 23:10:40 -0400 Subject: [PATCH 059/134] streamdeck-ui: 3.0.1 -> 3.1.0 --- pkgs/applications/misc/streamdeck-ui/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/streamdeck-ui/default.nix b/pkgs/applications/misc/streamdeck-ui/default.nix index 94d2791530a9..5685dea60823 100644 --- a/pkgs/applications/misc/streamdeck-ui/default.nix +++ b/pkgs/applications/misc/streamdeck-ui/default.nix @@ -10,13 +10,13 @@ python3Packages.buildPythonApplication rec { pname = "streamdeck-ui"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { repo = "streamdeck-linux-gui"; owner = "streamdeck-linux-gui"; rev = "v${version}"; - sha256 = "sha256-nLtWExxufxT5nRiEYLGNeMhFhvlGzYKA+crA74Yt4ck="; + sha256 = "sha256-AIE9j022L4WSlHBAu3TT5uE4Ilgk/jYSmU03K8Hs8xY="; }; patches = [ @@ -87,14 +87,10 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ xvfb-run python3Packages.pytest - python3Packages.hypothesis-auto ]; - # Ignored tests are not in a running or passing state. - # Revisit these ignored tests on each update. checkPhase = '' - xvfb-run pytest tests \ - --ignore=tests/test_api.py + xvfb-run pytest tests ''; meta = with lib; { From 3526a837bf16ea6f329301c18eb32261600abfa1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 03:16:45 +0000 Subject: [PATCH 060/134] bililiverecorder: 2.8.2 -> 2.9.0 --- pkgs/servers/bililiverecorder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/bililiverecorder/default.nix b/pkgs/servers/bililiverecorder/default.nix index 5999c9d8a41e..0bf34196a1d8 100644 --- a/pkgs/servers/bililiverecorder/default.nix +++ b/pkgs/servers/bililiverecorder/default.nix @@ -13,8 +13,8 @@ let aspnetcore_6_0 ]; - version = "2.8.2"; - hash = "sha256-u6uKLmNNw9DllAV4MmexVsy5GrGqd4XRJRRXpERQfXE="; + version = "2.9.0"; + hash = "sha256-8lEHo2ZEx4kkT/tLgbSmjFx9qHyAQIaha75ISIHj3hA="; in stdenv.mkDerivation { From 811b46283ad2fe4170feafb9d75dcec21c92a6d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 03:27:44 +0000 Subject: [PATCH 061/134] git-credential-oauth: 0.10.0 -> 0.10.1 --- .../version-management/git-credential-oauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-credential-oauth/default.nix b/pkgs/applications/version-management/git-credential-oauth/default.nix index 96277c4047a7..b7f6aa7bff29 100644 --- a/pkgs/applications/version-management/git-credential-oauth/default.nix +++ b/pkgs/applications/version-management/git-credential-oauth/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "hickford"; repo = pname; rev = "v${version}"; - hash = "sha256-dsJ2h0hnqAwqNZv2Wod6XvPR5za8YNYAhtv4pMICfO8="; + hash = "sha256-0sgoBvNVQZI8mOfKI5XWVQ6+615gKi1pO/4DPI6/fKA="; }; ldflags = [ From 497e897975617597822200d8e03332ed2f701c40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 03:36:58 +0000 Subject: [PATCH 062/134] gef: 2023.06 -> 2023.08 --- pkgs/development/tools/misc/gef/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gef/default.nix b/pkgs/development/tools/misc/gef/default.nix index a3b37d25ed89..1893d7ef0b2e 100644 --- a/pkgs/development/tools/misc/gef/default.nix +++ b/pkgs/development/tools/misc/gef/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "gef"; - version = "2023.06"; + version = "2023.08"; src = fetchFromGitHub { owner = "hugsy"; repo = "gef"; rev = version; - sha256 = "sha256-QfVtDGhnyvRWQhxRnDyQFiHD7DByTGC3fUKadTB2w/U="; + sha256 = "sha256-MqpII3jhSc6aP/WQDktom2wxAvCkxCwfs1AFWij5J7A="; }; dontBuild = true; From 03631d72d71f269e2dac3661be74da9a90e2e227 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 03:44:06 +0000 Subject: [PATCH 063/134] gobgpd: 3.17.0 -> 3.18.0 --- pkgs/servers/misc/gobgpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 9b0681abdc8f..67654226a715 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.17.0"; + version = "3.18.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-LpQMRn0mINhixbS8GpYAqr0pjwbnQdUOs2BH3rkQ3hU="; + hash = "sha256-OAePH8q8YQJGundd0VwtLEl3UkRyuZYAx5rcN4DNft4="; }; vendorHash = "sha256-Z7vYpDQIKc4elVBLiGtxF3D9pec4QNvWFLpux/29t1Y="; From 8db304643574ca24fdf31c8a99ccaa207107baf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 03:48:24 +0000 Subject: [PATCH 064/134] scaleway-cli: 2.19.0 -> 2.20.0 --- pkgs/tools/admin/scaleway-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 02bb0ae0f398..1ac149a2c7ea 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-DJTgmUH/n1TBKrgBN+8oG2ziRlAXzj6gOtjv4QjNkC8="; + sha256 = "sha256-zKqYbvSawu+xtDCxe31ERrjCMo4WLimbwAQX9mWvI7k="; }; - vendorHash = "sha256-RnTj59WsyY/cWkhe2bucMvzrI8EwC3I1kxccBCfFqtI="; + vendorHash = "sha256-UR7ZohQeLWux9AAvOUgtPA4F/qZXlx1vNjYrwal+Sac="; ldflags = [ "-w" From 6ce024fd01ebf160b8176281e33c9410abaad7fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 04:07:11 +0000 Subject: [PATCH 065/134] sarasa-gothic: 0.41.8 -> 0.41.9 --- pkgs/data/fonts/sarasa-gothic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index caa6e8c27310..b963e7fc8ea7 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sarasa-gothic"; - version = "0.41.8"; + version = "0.41.9"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - hash = "sha256-TLEyCFQfBsCCHqnYmJNMJFkM+iKWqly3969zw9AbTFQ="; + hash = "sha256-bZM6RJHN1Zm7SMmEfQFWSqrpzab7AeJgBfZ8Q2uVSB4="; }; sourceRoot = "."; From da2a0af17aaabe0e7a21078721d4c45ec9d1b28b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 8 Sep 2023 04:20:00 +0000 Subject: [PATCH 066/134] twilio-cli: 5.13.0 -> 5.14.0 Changelog: https://github.com/twilio/twilio-cli/blob/5.14.0/CHANGES.md --- pkgs/development/tools/twilio-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index 51b10de9c237..01b4732dc970 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.13.0"; + version = "5.14.0"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-WfaXYNaNBMcOyQshJkMgzGSmID0tmZ0TRN6N3lR275Q="; + sha256 = "sha256-b+CL3Rxkzbk7wSUNXk+x0dQvjZWmOuVh/qWdrIhvJFo="; }; buildInputs = [ nodejs ]; From c306ac2b6c67ab7e79b4e3f736af4cc350d18257 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 8 Sep 2023 04:20:00 +0000 Subject: [PATCH 067/134] millet: 0.13.0 -> 0.13.1 Diff: https://github.com/azdavis/millet/compare/v0.13.0...v0.13.1 Changelog: https://github.com/azdavis/millet/blob/v0.13.1/docs/CHANGELOG.md --- .../tools/language-servers/millet/Cargo.lock | 194 +++++++++++------- .../tools/language-servers/millet/default.nix | 6 +- 2 files changed, 118 insertions(+), 82 deletions(-) diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index de07ef3606fe..d270627c0cde 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -19,16 +19,16 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] [[package]] name = "analysis" -version = "0.13.0" +version = "0.13.1" dependencies = [ "config", "diagnostic", @@ -118,7 +118,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "str-util", @@ -127,11 +127,11 @@ dependencies = [ [[package]] name = "char-name" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" [[package]] name = "cm-syntax" -version = "0.13.0" +version = "0.13.1" dependencies = [ "lex-util", "paths", @@ -143,7 +143,7 @@ dependencies = [ [[package]] name = "code-h2-md-map" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "fast-hash", ] @@ -160,7 +160,7 @@ dependencies = [ [[package]] name = "config" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "serde", @@ -188,7 +188,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "once_cell", @@ -225,7 +225,7 @@ dependencies = [ [[package]] name = "diagnostic" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" [[package]] name = "diff" @@ -239,10 +239,16 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + [[package]] name = "elapsed" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "log", ] @@ -274,9 +280,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -296,7 +302,7 @@ dependencies = [ [[package]] name = "event-parse" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "drop_bomb", "rowan", @@ -306,11 +312,17 @@ dependencies = [ [[package]] name = "fast-hash" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "rustc-hash", ] +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + [[package]] name = "flate2" version = "1.0.27" @@ -324,7 +336,7 @@ dependencies = [ [[package]] name = "fmt-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" [[package]] name = "form_urlencoded" @@ -383,7 +395,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "identifier-case" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" [[package]] name = "idna" @@ -398,7 +410,7 @@ dependencies = [ [[package]] name = "idx" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "nohash-hasher", ] @@ -415,7 +427,7 @@ dependencies = [ [[package]] name = "input" -version = "0.13.0" +version = "0.13.1" dependencies = [ "cm-syntax", "config", @@ -463,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.13.0" +version = "0.13.1" dependencies = [ "analysis", "anyhow", @@ -491,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.13.0" +version = "0.13.1" [[package]] name = "libc" @@ -548,9 +560,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memoffset" @@ -563,7 +575,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.13.0" +version = "0.13.1" dependencies = [ "analysis", "codespan-reporting", @@ -581,7 +593,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.13.0" +version = "0.13.1" dependencies = [ "anyhow", "env_logger", @@ -601,7 +613,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "paths", @@ -612,7 +624,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.13.0" +version = "0.13.1" dependencies = [ "config", "diagnostic", @@ -636,7 +648,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.13.0" +version = "0.13.1" dependencies = [ "lex-util", "paths", @@ -684,9 +696,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -699,7 +711,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "panic-hook" -version = "0.13.0" +version = "0.13.1" dependencies = [ "better-panic", ] @@ -707,8 +719,9 @@ dependencies = [ [[package]] name = "paths" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ + "dunce", "fast-hash", "glob", "idx", @@ -719,7 +732,7 @@ dependencies = [ [[package]] name = "pattern-match" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "fast-hash", ] @@ -777,10 +790,19 @@ dependencies = [ ] [[package]] -name = "regex" -version = "1.9.3" +name = "redox_syscall" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "regex" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", @@ -790,9 +812,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -801,9 +823,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rowan" @@ -832,9 +854,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" dependencies = [ "bitflags 2.4.0", "errno", @@ -851,18 +873,18 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "serde" -version = "1.0.186" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.186" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", @@ -902,7 +924,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "str-util", @@ -910,14 +932,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.13.0" +version = "0.13.1" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "fmt-util", @@ -928,7 +950,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.13.0" +version = "0.13.1" dependencies = [ "config", "pretty_assertions", @@ -944,7 +966,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.13.0" +version = "0.13.1" dependencies = [ "config", "elapsed", @@ -958,7 +980,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "once_cell", @@ -967,7 +989,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.13.0" +version = "0.13.1" dependencies = [ "la-arena", "sml-lab", @@ -978,7 +1000,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.13.0" +version = "0.13.1" dependencies = [ "config", "cov-mark", @@ -993,14 +1015,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.13.0" +version = "0.13.1" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.13.0" +version = "0.13.1" dependencies = [ "cov-mark", "diagnostic", @@ -1015,7 +1037,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#0d94e3ce13f2a489dff86151f7 [[package]] name = "sml-naive-fmt" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "sml-comment", @@ -1024,11 +1046,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.13.0" +version = "0.13.1" [[package]] name = "sml-parse" -version = "0.13.0" +version = "0.13.1" dependencies = [ "diagnostic", "event-parse", @@ -1040,14 +1062,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.13.0" +version = "0.13.1" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.13.0" +version = "0.13.1" dependencies = [ "num-bigint", "num-traits", @@ -1056,7 +1078,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.13.0" +version = "0.13.1" dependencies = [ "chain-map", "config", @@ -1079,7 +1101,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.13.0" +version = "0.13.1" dependencies = [ "chain-map", "code-h2-md-map", @@ -1098,7 +1120,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.13.0" +version = "0.13.1" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1106,7 +1128,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.13.0" +version = "0.13.1" dependencies = [ "code-h2-md-map", "fast-hash", @@ -1117,7 +1139,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "sml-hir", @@ -1135,16 +1157,16 @@ dependencies = [ [[package]] name = "str-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "smol_str", ] [[package]] name = "syn" -version = "2.0.29" +version = "2.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" dependencies = [ "proc-macro2", "quote", @@ -1154,7 +1176,7 @@ dependencies = [ [[package]] name = "syntax-gen" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "char-name", "fast-hash", @@ -1164,6 +1186,19 @@ dependencies = [ "ungrammar", ] +[[package]] +name = "tempfile" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.48.0", +] + [[package]] name = "termcolor" version = "1.2.0" @@ -1175,7 +1210,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.13.0" +version = "0.13.1" dependencies = [ "analysis", "cm-syntax", @@ -1201,7 +1236,7 @@ dependencies = [ [[package]] name = "text-pos" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "line-index", "text-size-util", @@ -1216,7 +1251,7 @@ checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" [[package]] name = "text-size-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "text-size", ] @@ -1239,7 +1274,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "token" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" [[package]] name = "toml" @@ -1278,7 +1313,7 @@ dependencies = [ [[package]] name = "topo-sort" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" [[package]] name = "ungrammar" @@ -1325,13 +1360,13 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "uniq" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -1519,11 +1554,12 @@ dependencies = [ [[package]] name = "xtask" -version = "0.13.0" +version = "0.13.1" dependencies = [ "anyhow", "flate2", "pico-args", + "tempfile", ] [[package]] diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 95b7a2bc68fd..081333e89294 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-q7p3TB7YsfROW+6MCbcGCPTIekEgqQBi0MUHkIuhtHc="; + hash = "sha256-qq4SACB0heCOB8rJha+9Xi/ZZuAbasOieWM9IdZqYUw="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "char-name-0.1.0" = "sha256-uWKoRLEwbjndrtu30H0zysHLIXBqWa0SnYm6Iy1hUko="; + "char-name-0.1.0" = "sha256-txHvmD0ClTQqe6QhZ0DLgK5RON0UvZkxXCoZxC8U5+E="; "sml-libs-0.1.0" = "sha256-zQrhH24XlA9SeQ+sVzaVwJwrm80TRIjFq99Vay7QEN8="; }; }; From 7b6bc2521bc539c3a4ff479c0ec4ab902eee8594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 7 Sep 2023 21:41:06 -0700 Subject: [PATCH 068/134] poetry2nix: mark poetry insecure --- .../poetry2nix/pkgs/poetry/default.nix | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix index d175bfe01f30..b0423a98f9ec 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix @@ -49,6 +49,32 @@ poetry2nix.mkPoetryApplication { # Fails because of impurities (network, git etc etc) doCheck = false; + overrides = [ + poetry2nix.defaultPoetryOverrides + (self: super: { + cryptography = super.cryptography.overridePythonAttrs (old: { + meta = old.meta // { + knownVulnerabilities = old.meta.knownVulnerabilities or [ ] + ++ lib.optionals (lib.versionOlder old.version "41.0.0") [ + "CVE-2023-2650" + "CVE-2023-2975" + "CVE-2023-3446" + "CVE-2023-3817" + "CVE-2023-38325" + ]; + }; + }); + requests = super.requests.overridePythonAttrs (old: { + meta = old.meta // { + knownVulnerabilities = old.meta.knownVulnerabilities or [ ] + ++ lib.optionals (lib.versionOlder old.version "2.31.0") [ + "CVE-2023-32681" + ]; + }; + }); + }) + ]; + meta = with lib; { inherit (python.meta) platforms; maintainers = with maintainers; [ adisbladis jakewaksbaum ]; From ca72defe5fdde324c3bc28495bd7084fd878d4a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 04:55:13 +0000 Subject: [PATCH 069/134] syncthingtray-minimal: 1.4.5 -> 1.4.6 --- pkgs/applications/misc/syncthingtray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index a9ff5818fbd7..627f09979638 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -30,14 +30,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: mkDerivation rec { - version = "1.4.5"; + version = "1.4.6"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "sha256-EizKDw5Fv2qXxmiCx4NAvwxBZ+qhTIx4NMZedZ9OuyA="; + sha256 = "sha256-/HAqO0eVFt4YLGeTbZSZcH2pOojvykukAGTBHZTfKLQ="; }; buildInputs = [ From 2932ee753d245a1b19535236886fba620c4faeba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 7 Sep 2023 19:06:52 +0200 Subject: [PATCH 070/134] deconz: init at 2.23.00 https://www.dresden-elektronik.com/wireless/software/deconz.html --- pkgs/servers/deconz/default.nix | 83 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 85 insertions(+) create mode 100644 pkgs/servers/deconz/default.nix diff --git a/pkgs/servers/deconz/default.nix b/pkgs/servers/deconz/default.nix new file mode 100644 index 000000000000..ae1fb6119187 --- /dev/null +++ b/pkgs/servers/deconz/default.nix @@ -0,0 +1,83 @@ +{ stdenv +, lib +, fetchurl +, wrapQtAppsHook +, dpkg +, autoPatchelfHook +, qtserialport +, qtwebsockets +, openssl +, libredirect +, makeWrapper +, gzip +, gnutar +}: + +stdenv.mkDerivation rec { + pname = "deconz"; + version = "2.23.00"; + + src = fetchurl { + url = "https://deconz.dresden-elektronik.de/ubuntu/beta/deconz-${version}-qt5.deb"; + sha256 = "sha256-TMftm1fz8c8ndSyA3HUd7JWT0DINxvbdUSDrmVMwmws="; + }; + + devsrc = fetchurl { + url = "https://deconz.dresden-elektronik.de/ubuntu/beta/deconz-dev-${version}.deb"; + sha256 = "sha256-uW5iF3rvFlowFhMBVDTOHkJ2K4LBgAxxC79tXpMhy5U="; + }; + + nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper wrapQtAppsHook ]; + + buildInputs = [ qtserialport qtwebsockets openssl ]; + + unpackPhase = '' + runHook preUnpack + + dpkg -x $src ./deconz-src + dpkg -x $devsrc ./deconz-devsrc + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$out" + cp -r deconz-src/* "$out" + cp -r deconz-devsrc/* "$out" + + # Flatten /usr and manually merge lib/ and usr/lib/, since mv refuses to. + mv "$out/lib" "$out/orig_lib" + mv "$out/usr/"* "$out/" + mkdir -p "$out/lib/systemd/system/" + mv "$out/orig_lib/systemd/system/"* "$out/lib/systemd/system/" + rmdir "$out/orig_lib/systemd/system" + rmdir "$out/orig_lib/systemd" + rmdir "$out/orig_lib" + rmdir "$out/usr" + + for f in "$out/lib/systemd/system/"*.service \ + "$out/share/applications/"*.desktop; do + substituteInPlace "$f" \ + --replace "/usr/" "$out/" + done + + for p in "$out/bin/deCONZ" "$out/bin/GCFFlasher_internal.bin"; do + wrapProgram "$p" \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS "/usr/share=$out/share:/usr/bin=$out/bin" \ + --prefix PATH : "${lib.makeBinPath [ gzip gnutar ]}" + done + + runHook postInstall + ''; + + meta = with lib; { + description = "Manage Zigbee network with ConBee, ConBee II or RaspBee hardware"; + homepage = "https://www.dresden-elektronik.com/wireless/software/deconz.html"; + license = licenses.unfree; + platforms = with platforms; linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd646773ca78..1e8e548160eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26447,6 +26447,8 @@ with pkgs; dcnnt = python3Packages.callPackage ../servers/dcnnt { }; + deconz = qt5.callPackage ../servers/deconz { }; + dendrite = callPackage ../servers/dendrite { }; dex-oidc = callPackage ../servers/dex { }; From 6f085ddcfe983d6ca025bf27434015ee5dc4cb6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 05:46:19 +0000 Subject: [PATCH 071/134] python310Packages.hvac: 1.1.1 -> 1.2.0 --- pkgs/development/python-modules/hvac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 732496cdee88..7f8c9c5bea8a 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hvac"; - version = "1.1.1"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+dvMRrmLJQx4XrEFCqEe40oMi2YWt1IYzxNGqYF5kvk="; + hash = "sha256-b1qg1rgTi1hdRlbR/gG12HYWMQyASEuQnMhMLLjwZP0="; }; nativeBuildInputs = [ From bcfcff9ad15c6bbb4147655d9281b393250038b5 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Thu, 31 Aug 2023 13:04:55 +0200 Subject: [PATCH 072/134] hashcat: patch to build on apple silicon --- pkgs/tools/security/hashcat/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 0fec2a9ec992..5a2304b5fd0b 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { "VERSION_TAG=${version}" "USE_SYSTEM_OPENCL=1" "USE_SYSTEM_XXHASH=1" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) [ + "IS_APPLE_SILICON='${if stdenv.hostPlatform.isAarch64 then "1" else "0"}'" ]; enableParallelBuilding = true; @@ -76,6 +78,6 @@ stdenv.mkDerivation rec { homepage = "https://hashcat.net/hashcat/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ kierdavis zimbatm ]; + maintainers = with maintainers; [ felixalbrigtsen kierdavis zimbatm ]; }; } From 71c971b0f1eafaf0c428a5138c8192d0cf87a94f Mon Sep 17 00:00:00 2001 From: mdarocha Date: Wed, 9 Aug 2023 22:59:07 +0200 Subject: [PATCH 073/134] dotnet-sdk: 6.0.412 -> 6.0.413 --- .../compilers/dotnet/versions/6.0.nix | 268 +++++++++--------- 1 file changed, 134 insertions(+), 134 deletions(-) diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index 30cffb04d644..2d26a843a9fe 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -3,177 +3,177 @@ # v6.0 (active) { aspnetcore_6_0 = buildAspNetCore { - version = "6.0.20"; + version = "6.0.21"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/972dc929-4c16-4456-a7c8-64014f80678d/a3b62252f98a0d7e0c0a9a01ede18776/aspnetcore-runtime-6.0.20-linux-x64.tar.gz"; - sha512 = "891bad6a52a7bcd5afa2a784fe68044d282f6d53fedab4bde6dff8d7d2138a484e947f7a6be156094324b37e9d7e07e87a67622bcf2ea197c2924389edd1d185"; + url = "https://download.visualstudio.microsoft.com/download/pr/56d44b17-03c2-4d9e-bdbc-a598ca34fc01/8fcc1e19dfd3c86b09beb68460db6e85/aspnetcore-runtime-6.0.21-linux-x64.tar.gz"; + sha512 = "3a74b52e340653822ad5120ec87e00e4bc0217e8ce71020ad9c4a0903b87d221b538c3841949be2ca129a45f8105def0ea5152e44e7cef8858958ae04fa0dd65"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/a8a1a993-ddd9-4bcd-8386-d9defcf0fd29/4b471f72c8253fa1462ea923d0fe39a2/aspnetcore-runtime-6.0.20-linux-arm64.tar.gz"; - sha512 = "83b1825c80cabfa5bbbd8c3e69b3525fa5cebef773957f96fee9319d60285155817973a176d47348c9b22bff5af24044f0f06b59229c067ce8adad4f3d4123de"; + url = "https://download.visualstudio.microsoft.com/download/pr/1f8d7d02-581b-42f8-b74a-bf523099ab5c/29da812824f1a8cdfbe452aa5bc0ebc3/aspnetcore-runtime-6.0.21-linux-arm64.tar.gz"; + sha512 = "3d39f458831c2e2167c06eb85205a764e9aa497ccc26cb19968f03cb3102daaafde391a707f08c3010bff95cfc0e9586ea97c0fe7d8ef885b4aae009748591c8"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5fe2084e-1538-4193-9eb6-54b0f8470574/258915bac675b1dea6aa0b5435f64981/aspnetcore-runtime-6.0.20-osx-x64.tar.gz"; - sha512 = "5f6efea102c20805430815228070461216d8c5b928d090ec9d6d245eecbe23298920d1834276a0ce77bba524a14c83d97464580c72660bf3a2367a02f1872e31"; + url = "https://download.visualstudio.microsoft.com/download/pr/4eece21f-af5c-4bdd-8e5b-5e300f0cbc6d/5290c217803341cb2a51628e8ea0dd9e/aspnetcore-runtime-6.0.21-osx-x64.tar.gz"; + sha512 = "b7d604bc11224b32960f11ed2332cfe5cd595655dad5c2cae1fba40e73ec637f9f6e4246659296d90f544d7aa7c5248b0c7999cf82b4a325acef7368416c1dde"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/14d8afd0-2635-4f3c-96fa-63edccafe16f/317d19d4f625bdae211d428ab880a331/aspnetcore-runtime-6.0.20-osx-arm64.tar.gz"; - sha512 = "fbc4033b79a651923dc205b923ef6c9ef048c862113ebcaeb8fa6388827245039369e261e89ac371e895c538aa78fdfc07a5a1c1cbc41713f54a15bdc0ffdf5d"; + url = "https://download.visualstudio.microsoft.com/download/pr/a6bf9946-7321-452d-8dfb-120ea0911a6a/9d77b20bb6802d0e8a4cdeda58fddaee/aspnetcore-runtime-6.0.21-osx-arm64.tar.gz"; + sha512 = "bd1cf2252d61ab88e39d7cf6e7b57168363f599de7e2aafafa9f2373976c97653e83cbfff5d1708276b6503f8a21f60af8c8601835c4d6e0b603b3c4bb90902f"; }; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.20"; + version = "6.0.21"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/26b4797f-d3f2-40c7-8f4a-91120ab87469/4677c3c4e3ee7919836c3a5336e04509/dotnet-runtime-6.0.20-linux-x64.tar.gz"; - sha512 = "3688d7170a59015c36d6a5532db67bc22eff66b3eb0a7fc28e1f425791e27a5f467bc7dc593d7f455d72d08c7d27bfcc92b3c8bd30ec3c7c583a8aa82b5afbac"; + url = "https://download.visualstudio.microsoft.com/download/pr/25fc0412-b2ff-4868-9920-c087b8a75c55/a95292a725fc37c909c4432c74ecdb43/dotnet-runtime-6.0.21-linux-x64.tar.gz"; + sha512 = "9b1573f7a42d6c918447b226fda4173b7db891a7290b51ce36cf1c1583f05643a3dda8a13780b5996caa2af36719a910377e71149f538a6fa30c624b8926e0cd"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f45ea605-cd0d-446b-9d79-b9c033c10c11/ba7fd32581bb5f448abdd317d8d55b3f/dotnet-runtime-6.0.20-linux-arm64.tar.gz"; - sha512 = "bf9cd8b13ebe15bbe41d4f3229cc902c3de2eb4f0008f4b239f3d0ec5aa01254adb8a98742c0e32e98f4ba95923611ed9f54963225b462a829c184301bc98ef1"; + url = "https://download.visualstudio.microsoft.com/download/pr/934fe9da-efb0-47e4-8db2-4d2153c7fe0c/e382d2a3169ac6a8288f09c9077868c3/dotnet-runtime-6.0.21-linux-arm64.tar.gz"; + sha512 = "f34e1319ded1e1115ceb63eab16a4ac7096e36e3236f8117f61ec9f0e19dd50adb473e1213a1018abfaedc4da57519b85058e7b14187a33e0b91e79af4dabf63"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/810c2cf6-c3a3-4f35-91f4-facf1ac24ef1/3ecedc1a0888b571d272c0dd64080c52/dotnet-runtime-6.0.20-osx-x64.tar.gz"; - sha512 = "f21cb044df7d1f57ad45b7ed65893a103cd6fe15b78ed3865380044207136d42deddde29872458e70fae9c8e7f254dd032f7539b4b9820995a075d92b907d49f"; + url = "https://download.visualstudio.microsoft.com/download/pr/af927c74-8c04-4aac-9597-3b56902a812a/47139a25bbc5e58b24fff42f6af0da7c/dotnet-runtime-6.0.21-osx-x64.tar.gz"; + sha512 = "f34a597910eccb84eec683f75f3ea8b6bdfc33a81388face050e33df679863465c905c0c99cdbfc54b3eb2b2a58733f7185a18234e562b1af5c925fa44dcb84c"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0f3ecdea-c85c-423b-ab55-d97061a3d9f0/b01dd205c4d6ffdb6266e4540c82621d/dotnet-runtime-6.0.20-osx-arm64.tar.gz"; - sha512 = "27297a16bf1eec0e5a4154d8575b66008227a595cdd77277ae9796a53522b143ff51e063a7aa53a6c57717061cb2e5836c314ee43eeb86d465341fcdf834d773"; + url = "https://download.visualstudio.microsoft.com/download/pr/4c3bd8fc-abdb-458d-a675-aac97584babb/35b8a258af87daac35bab7db1af0ff9b/dotnet-runtime-6.0.21-osx-arm64.tar.gz"; + sha512 = "e5a853ee04890e0466489fc46e3cfb8c665aeaacda8646b6958337cb16aeb0edbcf6d4131d31510b12852262fdb466f4d9352e0818a7ecb7e00e4e3a5e5755e1"; }; }; }; sdk_6_0 = buildNetSdk { - version = "6.0.412"; + version = "6.0.413"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/62181759-93ce-4512-8de1-92de74a6ba3f/f83ea41c3161f301d3584598f9c31801/dotnet-sdk-6.0.412-linux-x64.tar.gz"; - sha512 = "ee97aa5258e05aecadc66e844fa8eef97d51e5035492999b974cc8272e4db1a862a1f88a925f38be9e95c71d2e961b56459dcd614475895df608945c8057c311"; + url = "https://download.visualstudio.microsoft.com/download/pr/8eed69b0-0f3a-4d43-a47d-37dd67ece54d/0f2a9e86ff24fbd7bbc129b2c18851fe/dotnet-sdk-6.0.413-linux-x64.tar.gz"; + sha512 = "ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/daff8399-d60f-4bde-97bb-c6e350c03e90/5eeb0b21bf1ad11b5f5a7b4ac217c381/dotnet-sdk-6.0.412-linux-arm64.tar.gz"; - sha512 = "669c19665f657de00fda41e5ffff8d80395618dc1cc7d6ec50cd06668b135b5fcca193919172c65394210b7c060eae146fd6d8d57deed889ca8fafddca66d06d"; + url = "https://download.visualstudio.microsoft.com/download/pr/82132239-803b-4800-971e-ded613cc280a/67d0025a0a54566657c3e6dfeb90253e/dotnet-sdk-6.0.413-linux-arm64.tar.gz"; + sha512 = "7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/094020b2-7fcd-45aa-a122-42ad85b25d15/969de8f0d024a5bee5260271e097519b/dotnet-sdk-6.0.412-osx-x64.tar.gz"; - sha512 = "0aa713780c4b7f4e0ea72a0813715883f57174f04386b85f3a6dda1a66d9cf6d24c76cd1e0fc0a0991b80b7868b39c719d5b98254e4f683b6bc89a9b4043be9c"; + url = "https://download.visualstudio.microsoft.com/download/pr/398d17e1-bdee-419a-b50e-e0a1841c8a3c/2e8177e8c2c46af1f34094369f2219be/dotnet-sdk-6.0.413-osx-x64.tar.gz"; + sha512 = "605b28135dbc8c34f257ea1d10d02edb16569957e554ecc49c2a9fbb4200960b2fe21a06f2b770a9907fa915ebef0e6260704cc9e05a81af931f10dce7f46165"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6a6555e3-06ff-4124-aad5-497a2940398b/47bda2f1324f867ae0da2099c5702769/dotnet-sdk-6.0.412-osx-arm64.tar.gz"; - sha512 = "3086e027b94ab8bc5b27e2dfaa7d16484efa2f6a7c1e291f420313021b3e6f65a5208de4b0d86271c3b83d05d784f29e231176dc6f5ba04e567336b7d7b7b871"; + url = "https://download.visualstudio.microsoft.com/download/pr/6152c11b-e65d-4b60-8fc0-3c506a6199d2/c9f1ce3f1fc5bc6fa758fac505845232/dotnet-sdk-6.0.413-osx-arm64.tar.gz"; + sha512 = "e3a24cdcb80b2e283cd93ebb0af4ad891ecb5f2002d56b82a379d5d99b934a58f5ae60d07d21052360f525692fcf7bfde0c678c5d7f9908101fdd2096bea4458"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.20"; sha256 = "1jncn2n75vrhsmh22f5ij5rhdr2ninnz0z8clsi3pmk8ba2jzgsh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.20"; sha256 = "1ssakq877f2wn51di8v64b3ij0izyr5glc37i238y9jm6l84kpyg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.20"; sha256 = "0a6d269chp0126sx2igjhsrn7x6q03n5qwhwk7fy6ci1jddrk960"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.20"; sha256 = "13b3yr8y54g5ypnsrr7870csbnl9avwa7r6gk7553sjab255rar4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.20"; sha256 = "1js58646f4233g6a9lkwwwhg0kb2x3r60a66lbzapk253x00fnrm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.20"; sha256 = "1cwn0dkwk2wvddfraqh28yqy3p5cyrnfkprilgy3bqbnq82mfdxj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.20"; sha256 = "1paf9f3kmprw09nh1garni8rswcq7cs5m1ib6hkrkqccdis4hfy8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.20"; sha256 = "1zr589pkivak83gjd7f15rc9g4whxmywjj1xyymbbaz46ain89gy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.20"; sha256 = "0azf6q99aplbca8p2ijf9ccwrigz9r2aaplczj8byi0jd5dgya1m"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.20"; sha256 = "134a4yszz8gvba2zm8lrds39qfxrf42mziy4niihd4r9n44ksrdn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.20"; sha256 = "0ijdgv1yczfppra6p770vf48vjgmrmcjxfnphah8rrlidssja1dj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.20"; sha256 = "0k4ivzwbj67n4rr56fmi4jh2y3kdjhbgc376gk0ld50qwpghczxh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.20"; sha256 = "1yiq9ihh71d8zlfsdf9xdnapzilxiyk987z9ld7w605sq6b45719"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.20"; sha256 = "039hs39abf1ngrgw1ali8pgzqqpwl6aiq7hqig85gj6phy5l8wbk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.20"; sha256 = "0xivyv70kzpj4pc4ln1rk48bm9z9zy3bck1m4vg161rrd58ry16a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.20"; sha256 = "06a211fjm9i9ipgh7y6fsp2si41mdr8hp5wpsvd083ybyyfsy32z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.20"; sha256 = "00vz5r4l5p78fkvlglvhhvx80qlv5szzdz9scf0qm8hf1v01wivi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.20"; sha256 = "1g0x96f8i8hiflzpb20h9wkn784zzlvd0413y8xlxgf187hj20yn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.20"; sha256 = "11sdzb1lrpmmfbd14b3may8d1n8smm1rmfsqamp7bni408j16cfc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.20"; sha256 = "0w69cfyww088v29bs6diy9jq0sl6bpiaildvq6rayl9vwid71qpi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.20"; sha256 = "1bi8bmil8wc42lp5b7a44c70mazycgxn2ag02r3r4wradwawfrmw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.20"; sha256 = "1c3qz6h1w5wfpl52ys7s29kj338n3wy7w5sn9ghdz5x5vgflah9l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.20"; sha256 = "1zzpj7czk28xip45i3fhhlh3ar0hh3ldar34c6w2vp4psvbdkm40"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.20"; sha256 = "06yzy9spp8d9pz7jihsrcx4rq3n9rcq2j0gq23yhfzp9iip2986b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.20"; sha256 = "0bs2hxyjyhnzvcgx4lplwlvlk7rr5lk0xbncbn8in74pvvjw44qn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.20"; sha256 = "0ra55v67748rr0acd22vgg2b31wmkaaghiifi26vwnrhihky9gma"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.20"; sha256 = "1mjj0bfm57anpywknshx8hc1z4xdinjxrxv3zim295w3dpz46y36"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.20"; sha256 = "1rqniyhv0i9zim6plbmrhcd9ykwabm5cm7p3mddxr8cgybm1vyfg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.20"; sha256 = "0wdqbzma9fc5sh74a3mcxlrby33qz2hs47kb5c9834qvbjf38fcz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.20"; sha256 = "1q5bk01briqlp5bzvkvrq978dzb52np2sp8lv67wjdm7xcbpnfjz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.20"; sha256 = "1zmsd13dd7vzwxqiznffvk99jqc3fdq3l382ixbr440a006splcr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.20"; sha256 = "1s1girqjlrkz2kqijasmbpfh2fngqiz2i3424i7k9snrzjgnn6ml"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.20"; sha256 = "0vmlhgywjhb8k6gi1624fk3q21gy5gsnjxl4f4w8lmaf22zkllvb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "04p7m6csfjqgndi81hpg51gr8pgzqqscnqwgrkkj7nas2ffdxlfd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0ky38wy91pprdhbvxp64hz2fmf4kkchw9ldk0i68dnwg190lkjqk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1vs4jirn78v65fn97zx4vz4msq2zrlmiiinh7zl0dpyn0dp68br7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "157z5liy55z3h3qvg9kkmapnldbw7v6qamxdfbk89l3dh7r3m5hw"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "11yv6flr0l49rfa222p35dqv3qbc5jbf7yf28q3x09kv0x2571dn"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0nc1mbdk3kafgqayq4zmq0gb5ff0hd9bbn660haadmncn8j44njm"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1xzk2kpmps01srj0zyllfc8m65y2l27gpqcmvkh2llkv881kbdfm"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0qxiv3a7cgga8xnsq8xkvm5qy1spvgwsk57lm54wc6jyhc13fp2j"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "14xfisjj5yrqcvy84f30jzvmchp2513afg633bq26irbcy6ilslc"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0zdm7bd1z90hn1rvz2k8vwxrzgl7lirmxx4k2ih0gjyp5yz8pkjp"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "18icvgf5avz03qv26ivnmn01fmz345lls0lzgl8n3qr93v40bjf7"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "00i7adsd6inpgxlr69xgvhsb7sg9g5sscwdmq46z0dp47s1vphli"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1wf0fgz84n6ag81ry4mydkwdzjrsxsfy7rix73hl8ihfy5f2jhci"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0aq5yii9i52i70nkgzm4sb2gcv8i3lw61wl3wbws3lak2van75nh"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0glzhxnd4fjf9qjn6knj9gw8j9svxf265sb3qxyl5wnwyqx7rfdx"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0ygdldk7xaa12y3y1mrid8v0045j7d2r9gg509m04r2xvan7rhj8"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "18nmnsh51pslli999g99d52ivsld67nq8kqxccylwj9qmj6cs218"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "14iz67jr1xrshb5vqph3wk5ngnx4a6ingcv868fb98gx13r7wfc8"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "00khxrlvfy49s5yxn5611vs24lqhmclzks3pf6wy51rw0fy540q2"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "00ws9fi2b5wy3jly5pxmgxcjkfmjixmy0m4lw4vp9h4rb8q6prja"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1lp4km2sxjb791srirywf11nyj69654i2s4x4jadbp1kb2r7hp18"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "1hbxd5nyzngynqvj7n0css7xca7kra5zrdz1g40wvz7hgdacd7j3"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0s3g5610m1asz410pp57rlkbcdnsf6rpr9mp8lz34la34w19gkpw"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0d509bdgmpjnkxz0gnbssdvdq3rs05k6frs8wpjzm6i5469pxjch"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1ilbsss1w9940wf2jqfgkirf5hn1lqw0p4hpd68r9yryai2s2wnx"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "16sc3gfc3dd0mh86xh3qg00lbdz3yq7f7iyan33rl01z6ljkb3w8"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0vd3dh0k192r5wf6k11p44sywjkgg4yag3a14y0v8f3lnxm7zqfm"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0qdxvknp6ns263r2gvd5iprcdcjvzcwdn2xlkhyy9ihhszkciv3h"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "08pjmzx8qlknq7dci8m5xlldm3jxcj28zlwjs295951zqifzdajb"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "17ygzmbcsj1xv5dx63rxb0rvn0laakng7asx0nxsa5pgx28isqdx"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0vw0wk0j5alk4ffnp9960cdca2gmlvh9dj553nfxdmnil4vpj7wq"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0k68kxzr0y113rasi0br3jh2f7qjvay61yk6hyizwiz7hikmg12l"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "0kdb86h8adc5alsfbh7mii69yc1iyn2k21wf2j90izk8g63qdzsb"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "19327qki08nnvvpqd1lkvisy2wrpcaj3v8d3qq10hyyf21in1ly7"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1b8wsdkhpkkm046v9yj23x3jdqygs64bzi9vjslbxg69h6andf2j"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0b0w27az1c97ailrjzdwlpzy7255nmq326gic51vp3p5a05pasrj"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "18r7k5m6j7xpz4d0cnk74b0alxcgz6v2nz08zdkz1f473s6hdkvl"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "1hi2kg5ka1biczyvg0pk7rvbfb08z5nib7yd18yxzjs7i7hb385j"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1w53abjj2cv39lgc8h4xwf42593cjhiah7vmfi4fc6iyl6q91qg3"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "185vk80j81vckacp0hangng9r2rcw884nirwyvi4p1v0jk66i9g9"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1d01hrwkvf9a64lmv293xf829imghmy4g59s6lkh2dcg96m7byba"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "082zbwg2z2p6fgqy0svd6iahawn1riiqdn4dn63zs6zvjwwc26wg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "16zmi46nkhld8lq1hm5kqndwm0l0w94g352mzammyvrpwsn0wyhn"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "1i9ghy6hvslnh53xdk0xwiq0j92cjim2nyaw3asrqk7rkcynsxz0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.20"; sha256 = "1xh5yqlpwhv1xwng93kw7v345dsmlwpg651zmi1mj95l3qd0p9km"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.20"; sha256 = "0r8s132mgx3283gf1xsg5m4fhc5yy6rkzmii56g52wxpl4si0i50"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.20"; sha256 = "1m8gi6nfy0x5ha2cja7f37237ybb6hd81dcspsb0shmbgag141ab"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.20"; sha256 = "0n4fkn7g1zknyalzs9vf3z6x19vrw594qxk1pnianw6db39c9qf1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.20"; sha256 = "1nzpshl551sbmpdz8im2rvr8spi0rvdqb2js1kd1988qx2x2jwiz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.20"; sha256 = "00jnmbljs3qhb03d16hh5pqy9na9lij77kgb1wa982lmb80hj7np"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.20"; sha256 = "0c33yyrzfl3p1db7vvd287g7pq3zk14cq1hc8ggpkfr3z3kih8lm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.20"; sha256 = "0fggkfpr591pk5867q01qhijhmj4wks04a77fldjv4iv8azlsn8p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.20"; sha256 = "08fa4s35c08rkj4nk7y2k9flliajvw20i2z7fp4a9dbpsjvkaj9a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.20"; sha256 = "149l8qsjms1zk20xazy6ggcnyhvlbp3rd03lhipd28787jy69d3m"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.20"; sha256 = "1wj9piipky41s5z7zwi76ksf8snzk8z9q4vdbl146kkcnaxrkrkm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.20"; sha256 = "19vxwiakqlp299fj62f2ijh8hv67vlk9iz1dg876gvvp06k9mkyg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.20"; sha256 = "1mb4kl2jlk6zsavl979j4z2xmml8kjxnnp3gfmv6rynk7b9m5cwg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.20"; sha256 = "1nz5krmsx7l087gsfpfsmrbwvjjw8qsmb8wcwn5aynljfl4jq7pz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "0k9i48w2lh2shfxz0w0qh19yd6y9qg05izhmqb89zpr7m5sccp5v"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "1xvrmb12fdcrd64bqrs111x170p712aazaqdspbbn5v3j1nbzal4"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0dp54dk7x8zwcgsydfmgn462ynl1809avmn6s22brip0iy7wrz5g"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "05h8bg0655scv6crqkygc9iac5vf18cfa2slm52bcsvfvic8ad6n"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "0yli4v5nxxizxfz24vk504bvjhngcvvk1ab3jcdirrg9z8pcp73j"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "07indvjgrygh674k50k4isjpr3171h06hfxz2gy99bw3fm0y8lm0"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1qzzxdps0h7dpzz3ks43wzqvb9sqhbrdywzi883ipy7zwndl1avw"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "08hfm9xjj6rl1c7zvcxfwsc8qb0d9l66l5j48k311apdc4jjsgg4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.20"; sha256 = "0nz759z6sgmrq29vjr2y04brfjmddr4ga7l5vrsv1k16vf39g3fq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.20"; sha256 = "02wqksvir4r22785w1rrnd4aqjav7asz8wji9v3955acrnhdg81g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.20"; sha256 = "07gsm1p1ccb3f1vc4n024ilz9hc7qnqxj6mwk3k8jbvw228nwi89"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.20"; sha256 = "1p74mcsbq92cbbd5i83clxigcmmhi825q7izpzsypdpd46v73hmv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.20"; sha256 = "13pya2yy68r247fc4r3dbkq2hwaq5909n8v47cr7bvz07mk8isnb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.20"; sha256 = "1xidixl08nys9jzi17w5f89kq9wiwc135ddcbnhpfyhllhrn03kc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.20"; sha256 = "0ypcdzhr3v48iy6c3z6vhi2yfl7rzp85p0smq2pn625c1v1xgmgh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.20"; sha256 = "0py3ydy5pbxzvgi2lmkgcm1f15p6kikcym0hmlaj58ag796b1kff"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.21"; sha256 = "012bssj7v9g9zg0k3zj29h9221shy579xn2zzjpxniwlgrvjalkn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.21"; sha256 = "0sq67slr4fqq0g9nv0bqbf8jv0fyjlf29c2xgqids67gq22k7cak"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.21"; sha256 = "01zs924jfnkz77y50r9pwx0mklvf67c6r765vy154d2ffrqj8dws"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.21"; sha256 = "1hcinwd9wz9lm4rg9lacic4810khmq8g53vfhn9fpm0cx7v0scqp"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.21"; sha256 = "109g3x9djfpjb9fkwyjn6rg151n7n01iyh3q8yd0wl178blwzs4b"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.21"; sha256 = "1f3jqi9zd913grq1bk53np7zdirjj0rhq7s4pip9bgdn7yihmc3g"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.21"; sha256 = "1x5v12gfssja2hlxv1wnv7s2cc28mrm06g4wsc2jgg01fgs58qi5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.21"; sha256 = "0rafj2750hw54wj2y67cnq1d8ji419x3cc83i9x3py0i2bxfs20d"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.21"; sha256 = "1mrjv4rkgfwk0c30wsqdy259lqyrlzpymrl7i0gzsg89wvz77jid"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.21"; sha256 = "1yqxjnxlipm4camw59k1rizw11hfgz3rvxdi8saqk2vfc2rzh1pl"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.21"; sha256 = "054d7nmajgxq65ksv99k8swhr18yzwvb7gzkryg4n2msp6akgsbk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.21"; sha256 = "0i6wf3kivl8lqrbq9lwnlwhnng2md415yg4wxnyyqz4a2mrj38qa"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.21"; sha256 = "0bc5zf1zyzi9cdrnpcr9li658pj2lv9b7fbcfavrmp22jlk81z1c"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.21"; sha256 = "1p1jgcxs4231fi5vzdibrp2vnxxnzh56f3my9fp8kcn7zp2pzp5n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.21"; sha256 = "0c3xm07zyglb38g3kqfza92zkpjsg7k7mxr3hq3jwxbfzspxxv6f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.21"; sha256 = "09vnwfwwwa0agb2i88ya8bdwlryjz5p4jrpc7qn0dx3dwzbpkxq2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.21"; sha256 = "17rbp1hb1yl3vw27yqa5zbrfmgnxd2p49hg6qswwc4rlb3zfrjkl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.21"; sha256 = "1mqkdv56qycp1l7bza9rvzaghvd8rm3z863s6w73i21f3y0xnixa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.21"; sha256 = "0grfr8v5j5g77smqpysqxr6glrw3d13gqj241pynzih5j6v0rz51"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.21"; sha256 = "0ssq95ymx7rg4b85hrxb1vfkdq8c41f464w029f1k9c21dd06ra7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.21"; sha256 = "1f7n63argwj3vw1y36pb8nj93ami8j1ff4ibp7h19555j96dnpwp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.21"; sha256 = "1qr5pkjgy1z4asa2mmkc0fzycmg4a60zy5ib3f3hpdq7416k838q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.21"; sha256 = "18dsq2n8sxwxmg3rblj5wgm6c3cvdmdll31lbwknbwjdp20c543h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.21"; sha256 = "1q7na94z30hd3xam802izb3mi9nl5l6s4akah5a62jqjxrjb76l4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.21"; sha256 = "1widhp61a7qxnjgjqavqi0d7z36drjkvi2g0r39y2sbk0a9hwsml"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.21"; sha256 = "1cwq84i6xd4h2ddl4yjzd6pbf3cm3g2kids0xkgjcafx3qjiqg4b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.21"; sha256 = "0pgc2rzsr1ag8hk1g75w1sm3p0qabr7fddckfsfk4sk54gwdr14k"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.21"; sha256 = "13f65051h35hbvrz2g26vsvi9c1fbrc1hkjsxvx2ys7s1qddddqw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.21"; sha256 = "0y9dwb9fpycff0jh3c7gqmz9vrbg52p1bs4d437b73sfl7yj6s0x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.21"; sha256 = "1hww6k853nk8i620d9gmldbaj9ylawwqhzcjfmzpkmpj1hij80jd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.21"; sha256 = "0ihsszn9s3dsk31rr4qvh3kvlf3dwrzcb0s91dblcgi40gyczqb3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.21"; sha256 = "1vj58wmhy6rib7y87qg44brvaqqmgnhy69w1icjq2dw0xki5gkcr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.21"; sha256 = "1dk61kz88mhss6x83za34xm0q5nrfv4pdp0mvjqsf448g7c3ndiy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "0rfa7lrhkslws7j31h51bii9y0bghiq8ar6drljyi45hzmp046rd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1pq884vc9hs34giwbj2awzbc3z168hv201871ivbj8scaxnbga5h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "0cm5h80dix7ca16bhxsnm63jvcxi52iy76v0dlzbnpr8f85i4368"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "0i1qgjwk7ghl1ajdyynl334ncv51nr774fk9xdsylz0qid7nk3qq"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1x75lhjwpcvh1qrfkzv20blr8kvjpjs79zwn7i39m4dns39bfqyh"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1a6r36g6sgx64faahgysm21za6hjnk62bp445xb8jxd35vbzqk2s"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "160hyyawl7zz5kwlzwhk6lh5hsnjzsx4h1vkiixg201y24dknim0"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "07b1f5iafhbgmvyxbfbax14wwyyrph89wfbq5bigsibg0j2275nk"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1585phixq77p44w7kiq3ynf8shfimkgh0raq6shpbp3pv6ayw2ji"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1ql6kbnav8g9gfc6pv347pcxf853n3q70r2w6l889zizidgvhwpn"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "0zai12wv98sxm51axg474c393p8z22dml8pxl9680hf8z0idi1zh"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "1lf3g9m60kzrysrsbbys9nwf5vy089lkdrpaix4wb8v7qz35z7bf"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "0k9xy7hz3rxcgg0n4jzgbsg7gwah2xz48i2zzy8msqffp46d7gja"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "0bci8z2p4akkf74cyd9x7x2kbyjxr3cik3yyajzc6v6p3pda2cmy"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "1s1cpfj86yl7y7009zvpyjxadyji4pvbjvfmzi1abgyqrq570gba"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "113jyq5ag1qsdxxzz2wk8frnzhybycmqzd945i5lz63hpsm64vmr"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1jrwjddqb0sqz3n1lsv3inx5119dcjkj4hsarbzj32l81zi6id85"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "13df176z04p6byf0msjyfw9rwmvicbnidrznvdg9njvdni3yxrk2"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "0nyxxqzsgfp3p8mcw258big603fmkqn8xxwgngz9ywbcz2vgm57w"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "0nf3wm66hr4f35dbfvg4qy5wbvc15maiw1dicwzwj4p6w2yxl5hx"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1rqsms2wm64cwcvc644z3vrs0jfb0gf1my781mshp7cp95z466z9"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1rga4gy7yna1rdkvbc07hm107kvmygkpwrdbrwbqlw1z4rvg8qs5"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "08msw4lbklmz0yy749fljmiwh3na5zkmjgihcyg19wi8b5rcqi4c"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "1vbz73aj4f9a4if9mckj7rjqfqk0bgwnwj77vlx6rshcc8fsngwp"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "0134c4xzbh3g5ags2ahxrjkwmicmybvyjnl18y06f77r4bnh81gp"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "0ck919lw68xh4x6klqzsc8hshn65ykb9nd4jpk17r7crmxj8jk4n"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "0rz5rn84irzf2k03dcp5qghhmgi9sji6a5l9l2hdjjr8j8pq9dw4"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "1vv0paimjpc3bacv5cz39y4gd5cpc9k9863iil8crmm2rkiy611i"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1x42nrh4bjf7q2m193dziks543g72cyf4gfylhsyd397kp940sh5"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "0sqxzfirdmaj2r6nc1yc83qb1sbgsl1r0qcjidrwi7dlc5zamrvd"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "0jffm6yxn78l14x7j53hl9729s9vyyv604w8zdk9npdf8sgaxiwm"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "14hbzh401vmfsngvnmc4c1g8hv41h0za0kh8g6ya3lsfylmzdr06"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "120qv0z7jhiplabsqal1ldriillqbbyk0qfrc51yrfp5p7ycc8sl"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "066fn8ncybkfpfssrr0pg0adhrskknn5agqf3bd0fdhwg45k3gh7"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "1bsax9akfrxkj7nyx20hnw98028y3fbawq9k728ldpf8znsk3j0a"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "0pl4yskax24y75mfd6rkwa9cahyv0a1h1836yr7nb3dks6a9npf0"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1dq1dq27fi4jacrq86xdwfwx49y7mgxxaaqz00na3afaaya2c2xv"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1k5ajk31rr9bgy9rrlj67czlqpbj5n5iycmf1hvg7knczaraihss"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "1qa1hhbmlb4brnbrx0g3ap9b7ss1f9ddmigjsxgh9z20i0y8pybz"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "01cfpcbds831w51k9ajwbbca6nj05f5cgqswjv5h5hiz85w23yc7"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "08yx4m92fd9sxmfx4r2i1qma9m5jf7rvf35kqv1g6r4pplvm3pzz"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "0kgh9wnx4h6vv9jnbpyzfn8ra2vrzcrza6h44vy4qxbcaavfrqgw"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "05cp30bkyfxiqfx6v1nr8rc08jc9br22n0klf1y1xxvnb5xh9c49"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "01gcn5dh86rjybl1g972id3p5zwiisb6ba9w6bmzybh5pbp2a3sm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.21"; sha256 = "0yhx9gdilrlpzzm5s97y248kr3qw26nmc4b9qzqix1diyln52z2i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.21"; sha256 = "1krvn76iq6y89k8vyxvrvb1x098j4bmf12va32hn9iidkyr656zj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.21"; sha256 = "122nl7llv198m8fih940icjkapk8jxd32ih19cck9cb0bkk0zcqc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.21"; sha256 = "0agjdrz2qy3qmc6r23bnqa4k8fj1kffzb7bibw7yhbz3xvvyxd9k"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.21"; sha256 = "11x18rqwis4459mqgdqhwzmqjbj0h87dpypn6cnxqp38x683zcwv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.21"; sha256 = "113p8mql4lfz9cdbfhn1ahd53kwc3d240m1l3z9nlmlbajz9y9xa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.21"; sha256 = "1b52v5rn5i989vlg92r3magxsq6svmvap409g5f9yks3v8cwndp9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.21"; sha256 = "1mhrrdc6vvvv7qq1qlkfx6w34zzlxv77jlyz5qznhpdklfhdh9f8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.21"; sha256 = "0r19id7qy44lm4xlxi5ycn0msxpab5wga94iy5s3sch6vh66r53z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.21"; sha256 = "1hwf4scm9s0ml477r4iilw8z7q69g87d15hq7v75dglpacikm4mp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.21"; sha256 = "1mf7axx2qw0g9sgiqy302287jz6ir9lxw14qd2hafqy83hryzl81"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.21"; sha256 = "11krayn5c82yicw2xkl2y0yhmjvdi5zc6383lsiv6zr1imk0iy6c"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.21"; sha256 = "1ljzi3vrx0lbhvp02d1fm3hws06phqgrsav1yg6hwk9abp2q44p6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.21"; sha256 = "11vjprx73v65khddghqh7r5x5zij04w9yjr9njhhi6x3zb42q0cd"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1rcsk1j7n1r5i57gr8q60wbc9wdkz09y2w1dl02pi7w5pf8a3j1g"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "06fhwpf5hrz8w4fjsb8hqzlpmc24jmggvp7fk10vvp4gy4jqc7ja"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "1xa6c30whip8m40m208y2za9b854fhwgl9jhzigny431f15nsf56"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "19zmawr6zihk6al746gmrw4sgjf5hkl3n5baaj0h3h177vprh7yx"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1pxycv7ssawlqsh192qsg40z3q3c1a4jqpwillng3kjq54j0kqac"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1swcj7v4ryk6sk6nil7g4nzd1zfss470ic7cgxkwpzlnb720rbiw"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "12chbi12vnvsfw2yrm4pj8hnba66cq6y83fwzjxpidca4disl34v"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "0q36jbmhwrpvrnbpckq7qaipwg82ic9gb02xgjizh18cpnr9xkgv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.21"; sha256 = "0j1f59qa7bc5lnrya39qbwsb9q9w6rvbhlzkjyal8k6cjdvlcwhy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.21"; sha256 = "1aq51kbaa6hz21qy0hxflqrdkp8fdj4x9xwqnrl9vg7zmqzjd9yk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.21"; sha256 = "0za904fcz2ckhnbqabavd6gm7pifl7ap9jzxakk11f9ym98d8ls1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.21"; sha256 = "0y25m7mc0nnwik9f30i9iwhw5rdhaacamiy51w15jz6dilm7m4m3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.21"; sha256 = "0qanqrbrpzjippga0awcp815052z2al1nrgf7sa2f91325b2yjx6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.21"; sha256 = "1ivymplxwvb78mc2m1v14p4gj2l8lpbrk90j1aq5ipqkikh7r0bc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.21"; sha256 = "1g4mf424mw3rww3rmybmzap1p9bhi0anmz6khd8ynprigshchccp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.21"; sha256 = "1nv9ynkblg1d77gplnpvyvbnym2jc9l7rdfgi24hwmw5w9fxdv99"; }) ]; }; } From d2d7504a4a88191da105f89726e96adb880fe620 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Wed, 9 Aug 2023 22:59:32 +0200 Subject: [PATCH 074/134] dotnet-sdk_7: 7.0.306 -> 7.0.400 --- .../compilers/dotnet/versions/7.0.nix | 282 +++++++++--------- 1 file changed, 141 insertions(+), 141 deletions(-) diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index ca35bdef1a4a..0e839f606ea6 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -3,184 +3,184 @@ # v7.0 (active) { aspnetcore_7_0 = buildAspNetCore { - version = "7.0.9"; + version = "7.0.10"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/c1348fca-4ef4-46bc-9f6e-04f2315e0d3e/50fe6b7c2df482cdc880b66bd46834c7/aspnetcore-runtime-7.0.9-linux-x64.tar.gz"; - sha512 = "aabf4fa5ca726dc52774e5d644800ef7477815b22a982b7a2752dec6569186aabca93d5386e195e7ead377144601a786ae6a5d76ff28435bdabfad495cfe554b"; + url = "https://download.visualstudio.microsoft.com/download/pr/08af0433-9ec3-4604-9d1c-85e3922a4524/396b340b4ee38765d7462e2fc61a5e3c/aspnetcore-runtime-7.0.10-linux-x64.tar.gz"; + sha512 = "580fdda88824bde6b2d5c09eb009fef64e89705a8aa096dc71338a549969842dff8d9f6d4bb4651e60b38e44ed0910ec18982a062b471ace18c2e22348de11ab"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/9aca092c-f9c0-48d7-a01f-3c1c2eaac903/01b345ddecc7a90d5c99d016fa5180a6/aspnetcore-runtime-7.0.9-linux-arm64.tar.gz"; - sha512 = "447ebbd115b8d38eeba70f531010832db535cf3a17404491f552e99a5a59c8c63525640694a6753d27e9a7ed5bf1064998491c1983361c1c37b152b01a3b8f8a"; + url = "https://download.visualstudio.microsoft.com/download/pr/712946ec-0b43-436c-abfb-3abab81f6cad/c83ba8df4dab39957ffa5e93604f0b32/aspnetcore-runtime-7.0.10-linux-arm64.tar.gz"; + sha512 = "83d3fc657328f127ea8881844dda2f91fa03f2157f5c76acda64cd091e430fa7d812b3984b803ac624b171f18a5eab3c7b5791a02baa68eddcaf7498709f982d"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/7e6cb756-70e3-4974-b96c-dc9b9d138306/9b0ea50c629660a565db33e74a69fe8c/aspnetcore-runtime-7.0.9-osx-x64.tar.gz"; - sha512 = "b2cf51cff120abda9b5ae213e294f73debd620bc8f3e6b12e1bb628df31457a5bb8c6dbb12cb1dcec24a2c04edd5ebe807d6761f6095e7a90441f1930acb8185"; + url = "https://download.visualstudio.microsoft.com/download/pr/d10c9d59-a624-4175-9069-4a13fcf9a1c4/427bb8da02c7907bc2f3115144c1515f/aspnetcore-runtime-7.0.10-osx-x64.tar.gz"; + sha512 = "1f1fbfb0851d62538aa6feacb5c38c14289e7b2d19be62c0e240da6d3c9336f3223eaa2f3e64559e6d8f599a33d9f8dd3d138998386ee9532854139b3275812a"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/f967c09c-7a90-4da9-b933-926ed7870b16/0e5fbf15f170ceaee7e3d1865b856a99/aspnetcore-runtime-7.0.9-osx-arm64.tar.gz"; - sha512 = "fbe725a764b765f9954ae771b3d043d6d1a53e53149d0b4c89a4138793d9471f2924f68a5b8e1c107d9faa07946f2ac00584ded9b179ed8d40cf230ac7d34750"; + url = "https://download.visualstudio.microsoft.com/download/pr/516a672c-9216-4592-be66-a628a166b583/fec0aa593bc700a5f5d3860abf1a4af8/aspnetcore-runtime-7.0.10-osx-arm64.tar.gz"; + sha512 = "95c987c38b80b1083016ff360c957ac4cbc2aad406f87095f7350704de8b9a23ae060e551166c396cadeb54f39f176d5a1bbf77704edaf0c0a308d87ca29b838"; }; }; }; runtime_7_0 = buildNetRuntime { - version = "7.0.9"; + version = "7.0.10"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ecc0d5e3-61f5-49b1-ac1f-3b46956e1139/1ec7760b1697363667623f22a16c67b5/dotnet-runtime-7.0.9-linux-x64.tar.gz"; - sha512 = "09552e5ae6ac014dadf17545ff0a30ab32921075a31fb33e7be148c13078e30d097f592ffa1b8d306563aaa3f6302e40c5c0ba815c1473bbd5d72e3bef55d91e"; + url = "https://download.visualstudio.microsoft.com/download/pr/e9cd1834-1370-4458-98f6-d0d035dcd41e/6d2ca4b900398e717287ad0e75eb9a3e/dotnet-runtime-7.0.10-linux-x64.tar.gz"; + sha512 = "f15b6bf0ef0ce48901880bd89a5fa4b3ae6f6614ab416b23451567844448f2510cf5beeeef6c2ac33400ea013cda7b6d2a4477e7aa0f36461b94741161424c3e"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f693db81-adb6-4481-862a-887993824572/9bd6d12296a5b07d8b4b0190afab4152/dotnet-runtime-7.0.9-linux-arm64.tar.gz"; - sha512 = "271396af3adf881a4c5c8c28a812f9a0a30e11497bb0c9cec12bee4d726ed9151b2d35eb9146b5938611ab60ccc249d5ce5c870f721f791d19a3b08545dbfa97"; + url = "https://download.visualstudio.microsoft.com/download/pr/023e4544-e6f6-4d2a-ab91-ff63eff97db5/26c02c09fe3a5d57248caa0a0d9e8254/dotnet-runtime-7.0.10-linux-arm64.tar.gz"; + sha512 = "e90b68b272d5db7cf8665bf052fb0300d50a69818d70675442dc891654d140f7f84527b849860589bf152de1d00aa55dc15ee32f5678d46ea0069210fd002b03"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/f12bda3f-cef0-4d22-8ffe-89f553b0e5ed/a0ff4b2aeae50d5192e0e6f47075345b/dotnet-runtime-7.0.9-osx-x64.tar.gz"; - sha512 = "104e724bcec68fd77e8f07b71ed364cbcb40394c9ca0d8ef52e1eaab867b579f06ed7b0b203a50bad3df45634d52b6be60829d87a48c1800467f242879f8884e"; + url = "https://download.visualstudio.microsoft.com/download/pr/b6caa3ca-cb18-4891-b188-aa661741ec01/5df34b59b10e79714bac97cfdd6e86db/dotnet-runtime-7.0.10-osx-x64.tar.gz"; + sha512 = "6b992fbbc673d5005f2412839c632f772f6576c9ff95d44afaca478a79597601b306e1f1c496836549474a2c35238943ba27eef5749b1a2bbdd8f36553ad145d"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/20e6ef57-7686-4115-b7e6-ac561dcbf4fa/e2bf64248953cb06d5bafd6919f48905/dotnet-runtime-7.0.9-osx-arm64.tar.gz"; - sha512 = "1aae7726b89c0398f29bc49fe9cc4c2c3f27f1114d5ab140c998fe74b13caa3eed05cf5ae28eb389f37de2023b35c3bb864be64a2e596bde673e27ce749c53a2"; + url = "https://download.visualstudio.microsoft.com/download/pr/fd4660d9-e747-42b7-abe9-eaedff0356ca/8a6f41f5ee23ed510c442d1350bda8d3/dotnet-runtime-7.0.10-osx-arm64.tar.gz"; + sha512 = "f578e00d5bd144c51e5d71adbd8e0ecc97f7e8ea06263c585785b41ffbb590537f5a18b63a78e45e90e798cd66fa45285059226b1904f4c2d4e2ea40c2c71bbd"; }; }; }; sdk_7_0 = buildNetSdk { - version = "7.0.306"; + version = "7.0.400"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0be7a87e-3a3f-4500-8301-49ccd6f24887/e9e36f35dbaf6625fec3e18f5c2b613f/dotnet-sdk-7.0.306-linux-x64.tar.gz"; - sha512 = "62df9bca9492b3273830e098e787ec3664243989ac03550534599fc331693553660d3cf8bca655f2d1326070dbb7b20b04743eaba77fa9cc69f6f0fddfdebd06"; + url = "https://download.visualstudio.microsoft.com/download/pr/dbfe6cc7-dd82-4cec-b267-31ed988b1652/c60ab4793c3714be878abcb9aa834b63/dotnet-sdk-7.0.400-linux-x64.tar.gz"; + sha512 = "4cfeedb8e99ffd423da7a99159ee3f31535fd142711941b8206542acb6be26638fbd9a184a5d904084ffdbd8362c83b6b2acf9d193b2cd38bf7f061443439e3c"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/fb648e91-a4b9-4fc1-b6a3-acd293668e75/ccdc8a107bdb8b8f59ae6bb66ebecb6e/dotnet-sdk-7.0.306-linux-arm64.tar.gz"; - sha512 = "1500927cd2b1e048de8ee5339937fd41073a85a82b7a175220a411212d22e4906b4e5e6d29b51d068157d2ecde33238d540508c700793dca8b04b4d1dcd5c89e"; + url = "https://download.visualstudio.microsoft.com/download/pr/16b0b1af-6eab-4f9e-b9a4-9b29f6a1d681/4624e54b61cae05b1025211482f9c5e9/dotnet-sdk-7.0.400-linux-arm64.tar.gz"; + sha512 = "474879abcf40d4a06d54e02997a3fb93dd10c8d5f0dfd5acbf7e1a6f493a6d3421e426431d512b482c62cda92d7cda4eddd8bab80f923d0d2da583edaa8905e8"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/3d615bde-bfce-4ee0-a3b9-73dc4ea5a472/907ac9c03d971c7577ce60932456b3e3/dotnet-sdk-7.0.306-osx-x64.tar.gz"; - sha512 = "1ba293a9e07819aeb646c86f0db8280394c4a2b62f828d57a5ae80416cbafb1649a22e27cb12cc315dec1600cb825be645777d15e2f7c8d858fac3c55d0ed057"; + url = "https://download.visualstudio.microsoft.com/download/pr/1a603c4a-7e79-44ef-8e09-426a2c1c6e60/eb3dea0e50d73fbf28edf88aa8378e38/dotnet-sdk-7.0.400-osx-x64.tar.gz"; + sha512 = "e705c7466c9aa0c1203e0795ced23c6b794285ef60c8f7e1d199a09e596c20180901c2ec9c24483afa6302afb46a6b87ce18533283e2223a2161776f25421f61"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0e57f35a-00e6-49ab-aa75-7ae6711f0a8e/f28c04285b8bfd3f975731a186e23c23/dotnet-sdk-7.0.306-osx-arm64.tar.gz"; - sha512 = "ac8c0b6e9d2235c8ee639c6c50b2f412f808a16f1616964f6166c7c57d899be2a0d8e83dd6f3010634f8f252da483c5d99cb083703996a99a6b9238cdc2cda6f"; + url = "https://download.visualstudio.microsoft.com/download/pr/3df92af2-c066-403b-ae65-10b7ec879b32/a4a5a807d92510d5b74ee8fef9b2babd/dotnet-sdk-7.0.400-osx-arm64.tar.gz"; + sha512 = "134f764680336481a67ded13af8f9ce9e89e29937c7998d8e6a3695593dd1246b8d9407649f125032a3057c138b9739aef3bf8e3acdf0220224417c2036bf159"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.9"; sha256 = "09d86p5r8wbv03f89cylkg6czwf71m50fkxmav9qp3p5cscayzql"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.9"; sha256 = "01nkzvwgrlmgw57llabdgfxqz7jp54a2p3fd83zdlajqmmf54wi5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.9"; sha256 = "1z0cbmff7kmv8yg9x9j4jzga689fy4434z8jy8s3vjsvmcj96wmc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.9"; sha256 = "0059ldcym4lwrifibhb8qlra2f3ygzb95laxjgxj3jbdh78fy3i8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.9"; sha256 = "12wkvz1mwyxv7zcr18bsyfa93p0wjmxqyz26va34xrfws699ip1v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.9"; sha256 = "1spnj5n5l0hksrq89blj0xcsp1cnk2dw8n0giqrmq790yssvzn16"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.9"; sha256 = "0paqgqbddlnz6p0q1rmc8rdxhgwhs2gqnhbq8b53c0pn8dv554nz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.9"; sha256 = "0zw8bqj770gzk03ddxxh2y69krgxvrxn646878lf0l8ssllbsp5v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.9"; sha256 = "0zm2gly0pkm5x0zngcbbz060i2p5xssrb154pnix9xbhpxf9bab7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.9"; sha256 = "019fpgx8vminim43x3j4ym0m3fg42r8igw4yhh6ivbfkzyy5jnkb"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.9"; sha256 = "1vsrymzxfrsa3dvmia9wgvyyz1s8h3n76qwcysa78dqf6lkas77s"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.9"; sha256 = "19wzv0rwddcnrkz0g10gqya0l1brpajkg1krpcf8br0ly0n6fddi"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.9"; sha256 = "1l3g7l5xzcw3hpk3mcwsl6g72qfrs0m3blazrngma73z4cj3k9bi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.9"; sha256 = "1cl0xj4aafsfsvms4il6nrx8dyfwx0wdykwzrr2azy2yxvymqslr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.9"; sha256 = "1ckgzrwi67prsab6zrjjm0zmf6mbk7wzjjg197nnrjfd6sp5dpq2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.9"; sha256 = "0ymj65d1fjn7mm5w2myrhrq465xsr1nggnvpmbfr5md9g9zz78h9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.9"; sha256 = "0jhcajp4dy3770y5394rapsjl6z7jfdw8c2wnsqdr2cgzwjcjr3s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.9"; sha256 = "1rprrl8qbdn9v3j7k2dkh0krmr9bak8k3r5lm9v43f1h85gcicsk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.9"; sha256 = "0vgn0gd31xfk4j7a8grnnbn3sc8afbncxzcfykzlrpqmzn61plvm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.9"; sha256 = "00v7yivfj6vl2w0cxnw03pdqwbqz55ds32nanqmni069466x8aya"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.9"; sha256 = "139lkp92clq50d3jcpdlv79mx72fi46q7bb9skbgc6svz9d40x4y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.9"; sha256 = "0dbwkh60f4sbfxsfzi5kyhc7aiz6f9bx3p0m5h897pp94xz7gqrl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.9"; sha256 = "0v6ln2cbh09nsglkcclay9jkxchnlg89qkzxmw2ml353b42an1ca"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.9"; sha256 = "0kp2zhxq7dhsclb57ah3xw7ahp23n2xx1lxxmqkmw8gqgan99jwf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.9"; sha256 = "0d380v98ncgbjzhrd3pf6ff2155rbl173sr686ifs8djl1w86q24"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.9"; sha256 = "1f1cjqw2wxdykynj2vkxlhqk7kw058219yydyjsgpczrxpdqmcqa"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.9"; sha256 = "1kd4xdwwck1yjb2j4zwj6xq7b6skbc5x565mpzki8s0x2pncid7s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.9"; sha256 = "15fw7ywbn28asnn6d23rl5bljzx6crxq8nj0iv7l24c96l41pi55"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.9"; sha256 = "0k5iqm0hq9f9nwq9sazld3ada7zx2wypcf5k2ddhrwr53wr3rb2v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.9"; sha256 = "1nmb8hjln8y061381rii1q0m8ipbip51wciypdgvngzvjsibhsgs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.9"; sha256 = "16advlismh4qki0dslnycicy73xlhjm3cv595v8yldrvynam2bdp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.9"; sha256 = "1lxn13pvg2zynwnzxriw6izdq778w004m5ijxircn1mhzrziipz9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.9"; sha256 = "1659734dxb42pcyjsbdg1r9m13z59qm1kd6c23dpix2dwfn2jnrw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1zyrafkqv54fd03m8pn7gly2svh8lpsfkbf8cr962w56g7m900qd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1zsshmfjm8ivh34qgb6jcmrd5lv9c8lb40k9splg0d3vi9769kdk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0lgfaqqjsijvjspz2as5c5wjcgpl38pqyvy016b6bq0pii3008xg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1v1vq51isgmj15x6p9jmilvgh8kv75748ga7ba9d9azjcia6dj18"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "14z8nr5h8aw5090xwd5ll82c9j936fhadf9k0skb8rghkwqlak0n"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "10vkpyfp5v9nv2rcwbi20874a6swqzgzn7w4y5zkx51q9a2r80yb"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "064yry4gplxjsxn46ardi9jzvpmm77b0pgv9izhdlp5jgnxp8hrf"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1jzasfcy1rmn6vmsm5i96srp04ha6nv4a564p09wam1xjqspm3fc"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1gri5l2gbxkbhhjxkzwa4wnyrm522pimpl8ad2nhq2mpa62kmk20"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1jimxwgx5b311y1nxchyxg7yabkns6xlhx9sc0ha6nyv9m9bbn4y"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1ml6kb8m6l64gvf2igh0cqbhgk51n1alqq1zn1hfcg695wm0ldxy"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "17ls7hkmmiagdfrvrh2w089pi24xjyg5w5xbxzwagv65aff0m50z"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "02n69ki00djz3504sfz26akgyk2m0bqd3cmpl3553sh68igqaqnr"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1cwsl8abvb5bvkciyb29jv0cbc9yr5gbsv4d16q7sifhmhsj7ccj"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "17vfj41qza3l6vslq5zb8d8wj9mn23d3z6g2flb8spdlvvrc23mn"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0lcx0zwdryw2jzv61jaqhslc3iglg2kc6lcxqs746vhwsqd40fcd"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1cmjc993gfrxijk4mkfjvhz2zs146353rhg3948gal2r6gdqnqba"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1pp2fgk7c0gdjqmdxddj0xw99akrqpw8hx1wsj4x6yx5f3p3hgay"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0p06lmfip9iz934sdvql4iir9ln6n59f0bwwg40i4fldvpfgrf6x"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1gzfypb84x6wr3rrywr5m1lv0a77wz56vzczb6c5kgad9dgjxnhz"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "062xbr09j64bh8qmq77mhdpkd12b1xn8282xyvbxb9svpgy5q3in"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1mjvzpsbr8ikbd6417y81bwfn1fa5g4i1hb6yv3spxgl45rpqy7j"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1fpl01yq1ha0912sr5wj3rwg29q3jknhdaibw92ql8jdmbwp6z1b"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1zxcy12nbpfhc7a0p3vmi645p79gnqi7g4jjd9ap7rg57b56wd0b"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "15qvi3x575976hs2xqrr0z68mi8v8cpal64sc669njlfprk0rsw5"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1zr89aaxz4qlqk0fi4xqwv138k54lskwm219iacpkjvci88brc82"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "07dasy4d7bnirkb61mirnjvgvw7l2266wi4bb69vfiq0gzfzbzr7"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1iiba4mkvhcbf1lc9ydmafxzd75mfxw16d3q4nm3mravf88hga4j"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1pvrz3gd1p7ihnhfgl1hlhxy6f90238alw4v0gdwcfqbxlnnfvyh"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1ammp0lxban03aam1i5mhfqh0lpc31d9qpy08i1qzs8dpy0qy8kc"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1gl2j9n3h0fhx4dpcq3lwvcnx5xirdsjs4vq0jph01zfxsvn9rh5"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0zkdalcb30dpv0682cdf0ib5hyz8ic4yksp0kj1ybrgj6wmnhgr7"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "0m0m7cja0s1sza51qz2300c8m4397ii5p5nppm9nvx1cqhhrxyq1"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "0ds54pnkn9x5nyngdkkymwkg8k0wy3g4jpb098h0hm8pv1pikvz8"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0p20jsz3h5rssiq6wdf1i0m5fb52y3l2a7d83j5s3fllvf1hpv5m"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0s6i21a8raazrw4cm4cs1jjxmpqmazrdjsa7xgk8j6r71galml9h"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1zxkvw32d099pjnkdza7jmfyxs8q9j46qhn3i0g2b01m7rla1nh4"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1ckx746lmb7m952c27hwrnf4ngzx5zk310rpgdk1v74n767n2l4q"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0jrh9507aa2m82i7b8i4ws7rx3fpbdlcfgr7qrv6046myipx847x"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1arfqghv2v13knh95k300vllx3rnb6rjfn8h0k5qyvgcha5dxjhs"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1qvr9xd8564bg6zq4qzgjvs1yy6cvpb6k6rbzcrffa0ql6mp5whh"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1vnb8719i9j1x3nkl7hc6wrcc0w98xiwj2bhaxxwcxjhnqid2kjv"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0d9czhxn25322iqmn5lhv9bwnznlcnr1rsvq52y6h3ks4lqbpx6d"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1k3abndg0gxji09wwvnnbi4d8m3xk51yc2hir08vb064i28x0vwd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.9"; sha256 = "1phh09w8x6i4w15rjrgc74pljaqrrh4cc2g2vaymffx32nbd8b0p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.9"; sha256 = "10h6gmf8f600qir9b282d9c3890b1jjkqkiv2h1x899cibx3r4xz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.9"; sha256 = "1199dqdkd9q568scprvbjpqqnjh7476vwykjj3wl242ljc9lzv07"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.9"; sha256 = "06q2r3sfj2g7r564q1ys0ny11dg3qz6nifrby9phijs1pwcrsf7l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.9"; sha256 = "1cw4cm7hr4x3niynbxc0z4lwn8lmd78x00vmb1kq52gvy24vnpvz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.9"; sha256 = "1jkv8a4apfjq7xjlw7mkap3h1znrmwb7kb175krslp9arldh9lc4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.9"; sha256 = "128gc9zy607ybhs58hc49lvwg1ddlmz3s6ak4qdibpjzxgaxd444"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.9"; sha256 = "0cgbxm4w10kxdjil8bl04d7py0gbccs5npaxnji0xi45977ajs32"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.9"; sha256 = "1vz7a4jk3l1xgihv812y198c0kwgbvl9fh21r32jm363dxrd2lrb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.9"; sha256 = "05vhl80v3m3jql0r72ba15gd1q4p1zzc709klzr3wv50zsjqpcgp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.9"; sha256 = "1sn6qxc57fr5w9hh9x37v6z0pgwch8hhm5jzjchyflkdj9g60zc6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.9"; sha256 = "1kxjwrqbrkwyigyynlcl8lip10rmp029qikiifq5mm6j0ifyashr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.9"; sha256 = "15h20x40x14grk7d9jacgi3kfrrlkszg5mxf5mcm0ycphp9cq4h7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.9"; sha256 = "0x9zkfp3917wwaz20c1x6yp22iv4zj6778l38m9xbhynsjiak33m"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "025znra1878vbq7ywchjnc2jq1xsqnl3lkij5qacjh13a7zg8jcs"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1aaxyyg4f7apb5naj8fj72mh3jzh6v0rdmmgjrx467z471y0ccss"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "11gj2kk8h4jpzgs0hyxa1pgsxw29y04q33c3n70bgsnjd6qrrprl"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0x58n7zl28973w2rbl7zjpwqvfq3vpr639zi78654sj0xjvqgd9f"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "08p00883gf1xinwp36axld678ab039raqj6gbyya0bh8wcybwksz"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "0ck7fqjp6xgnl399lhdp2lqz7zj2awx13dvxbyvql0iv2iyim986"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1257h215aa87irl6pd64sa1600kmhhdv1l545jlv4x7hm0jqy63p"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "139ccsmjg8bgh7f318h921lv8g4nbhrycj0b3h7r8nxpg484inls"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.9"; sha256 = "0jg2qnm2wj7bwzgdw656sbvn8radsg9r7nvbsk06w6kn053kpnzs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.9"; sha256 = "1d633c6a8qyj5lsv6sjl1yb9j8pinkyv4m6qysffzz1swkzg2fn2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.9"; sha256 = "190n60bzlwsrrs1pr79va4qxbh0vj2zshjpw8wa3ypbfgw9nwfqr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.9"; sha256 = "0lg0hncd3f79z5rpldk3751q1k08dmn4nyzmg85ivci5xp2glmc4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.9"; sha256 = "0ldwqi394i7dancwz46d1g5w7w2d681k0qbb21wnn0l8llairmsz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.9"; sha256 = "1s6g2agg0yjzxppzrq06zg53ik3nk40pv2py3r91vvm9as10l0la"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.9"; sha256 = "1a3yv46jkpakpd35qbnyx0rik1w90wmpbffd2sx919pl77l262kq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.9"; sha256 = "1p7rmjsjyginrx6ml3j0pmlvghp6rhi7p2myn6di1lawi4c245sp"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0hpbb13459izw1c5qw7lh1sy5fbnmg7n8977jci5far584zbf3im"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "162pjnjp7k5y1xckl0l7h06yv2d65lczwspqfcyy1ix7whx8l5fm"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0kikz4mgymxdjpg3xwlzwb5b7qdq550qf4rknaik2qklwr2xv7xr"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0crf80nb3pw4wr83bvsx7f48i63f2l1b2zc18sny4xhqlvbcfick"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "1370mahfnshdy63vlxbyqpbhmv5rby5azfbnyc72xb7zglf9aqcb"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "1v3knzlfb6ik4306lhk5d37pfmpxczl0d4h2flvvzs61ap1jpgh6"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "10a0gk0nqx3p9xjaxlwlx6hkvnjps2dyfih91nf10dw31w40q4h9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.10"; sha256 = "089cpjkfwcwn2ifzbv4dspm84drcn3r3ck9mzxbyyz5vnvppbd0d"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.10"; sha256 = "0jfy3kjb7q8dsm8k3mnm81n08zfsk0ifjj1i40r71yglfsp8xkzd"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.10"; sha256 = "00lqqp5h2f4kv6l7jy5zs8l9mqjrqziw86kyf4fghldcpb2g7nmk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.10"; sha256 = "1hcxbb0s3v510c64i8jz3dmszvyjyisrn4m3qvnlx6cjcfwpgy4i"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.10"; sha256 = "1g353xlq04fr7vwm6c4xzpi2mr8w544drch3mh8jz3bpb3km1ms1"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.10"; sha256 = "1mjg5i643dbzkan6bi9b32w1csn24cy7c3zdzn4i2d0jzmfnqzs8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.10"; sha256 = "1cbhjqzl836qsagc6lb63vgc2qp7kmi5bdhr8p9spm5kgixw905q"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.10"; sha256 = "00n5024l9nh3pvip7xc4zrqrfj7yfnc5lr3crv4cyzf513cxi13f"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.10"; sha256 = "086lrqyd3csrczmi2rwn8hfjva11zmxbs56kgz1hlyyy34007bgc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.10"; sha256 = "13kj7b7h8pigcgkmzqzcg148bazxw8440lr7srz27prfkhlj4h70"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.10"; sha256 = "0dvajqgfb4pcsddgsb6adiaai181a4rfw3gii8nlr9alv38mr1bc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.10"; sha256 = "0d3fywij0sinnn4qxjyn9b8nvhmw06c3nqk712f9b4qz6wxhlv3m"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.10"; sha256 = "0gs7qbwwlp91hb35x2jhr0zpigjpib8bhp9gwc4hfprw7f8431b0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.10"; sha256 = "19h0cnar01w5f5p50k02z5a1mv4m7ixwaq7dpmb7y4dca56mjx00"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.10"; sha256 = "130jg9r19dchk8xmxbspcyj8zl3qvikz62ck4bql2biv362alhqn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.10"; sha256 = "1mi0xmscdix325hzxmqrv3fjnxfanvby7qpq1a3kkkspaijsrlrv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.10"; sha256 = "0c5rwllrvzwybz47r6pibv9r0bxmx9yplxs6ki0zl8gcx0rvxfzq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.10"; sha256 = "1nkjw5aw38aah1w750vi5bjvly6c0303nydjfqzwc2ws4c71qdln"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.10"; sha256 = "04hcs6bq12zqnijp15fwwiqxz447bnsz649h77qvl11hsnqp7k8h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.10"; sha256 = "0ggk9zlb16pl2126n78lq0j25z8z45wvhb561872mdy8y29hkb6m"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.10"; sha256 = "1h8wajbb2dz6ms510v8nj9bp5zx9j5vkrs6yv5amyzi4545fd33a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.10"; sha256 = "01y8wkqjnl6z5dmaz74iw5vgk6jjs9vd7kap6k547irbiy9svhxm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.10"; sha256 = "18cnvbdgzcm2wg361pwsbzymn8n6lsip9gqh52wcjzf9sjwd177h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.10"; sha256 = "115g0igv91ysnhsr7pvspma6nyyhjylpppm7aailqn4w3kz1c54f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.10"; sha256 = "1q4xfaszjwrrvkrnhagmihlixwqgdk28n5wggn9q6l82md2va4ri"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.10"; sha256 = "0pw90dlbh9pnry98ryr100fvmxrf1ry6y28zjhvga0ig3ql8yc51"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.10"; sha256 = "11bd713na563dvp10qm1haj4mr4hdhh1bqg8bimfjcgns858pi96"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.10"; sha256 = "1ldz6gib1hzpbpkh1j48asyx2w73bw1i6chxg5gy5fvig1syajkc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.10"; sha256 = "0salk1da71sqr85kbqzprjjs1zqfrdfq1fy9il4yajhhk6py3ql8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.10"; sha256 = "02kb83ipvynf3qd5sb4dwcv2rslngb22091fiqr1b5da5vmmjiwa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.10"; sha256 = "11v74j7615z1ir59424aifyfgvc096f7lqip6zkdfbbxqrghjj1a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.10"; sha256 = "0k4hk176vxf6i8pv9m4564yqc47nav8f1z2fb9br3cw5i1cvzmmg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.10"; sha256 = "0fj136zcqaybzbhp599i6g63w1xwshl5241lig2v5njb42k4a1c7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0bwb00hijg1ca597li1i1gsyw5vzmqxjaqypdrybsdrqph0d12fp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "17jkfcy29x24kxcf28g89m6mxb33rg5pnhs3ygr7lrg6da9k96xi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0fldpcg7n07nqzyhajm361sp5y7j44g1lm4f4rky6ccjsd2jhzx6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "10rqr8706y0jgwk0ng5q6v8lssz7yms3fmbzyz8kmm0b0lskwr1w"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "1f8bhw15nsv4z92q4fcyadbdrzw31iribgni5mv8xphjqwms22x3"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "0kkzah9ha1pfjhd7f06vchndnfzw1cbqrqfizfv7y75is9j24d1k"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0rxgrd0bv8i0asyxxrvsfbg4qsx2zh47jgn7livrprfs1ih0vfc0"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "05hfkilgm5yv2iw05nwqwp0kv1f2pllkw1hwf73fiqxhc5yi4gzn"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0x7m0rhslsnqnml5syg98vlrimw5ih7zzgr6c12661i1hcqwpj9h"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "0l698rpwqpa4k1l6ykb0q86j3r9v1j2kibw9yxynkbr61mrnmhqm"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0265zsc9fwslcr8197gil0s4xsh6ascrllgnjdpy28v26cki0cc9"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "086xnk6i1a7bxczgxb0g6b9jx7qigkkwdbsfrb99wx9hq7bry8qg"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "14y4j9r12dm86qgmhnr6ff289fdh6nigpcg9lya2avfm57p7qang"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "0f3axfrshdr9gcdwyaf24czwfd7nw8py2z14inyzsp79bw87c3w7"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0jnxwp6xvc0djcwrmsk8xxicxhl82hd9fvmxy9gxw62gsvfzqavh"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "0b5hxgzzjsqfwzqzf2wzbhwv8yr6s05qxcmjlxy92fvn98ywrymv"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "19v459vdsadly3jgwm8qsa2z2qqspjk9n02k39j46m76a72j60hx"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "1cl22hgj2ig4dq80l84ia9nmmrlq3rmns7mvjy2w9gk35qca2534"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "1hj75k6ar3bznaak0m6hadzkp93q96dnhghzqn5lzniqzbxh4cr5"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "02i2jrdkq01zzlx2j925svlsj2fp9wxpyx3q9cvx2r4n4c9qjv6p"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0s5i1irjnmp9kmn3wcz7j5ppb39lajm6r1ip90vp5677f20r5i3p"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "08mygly5bppfk1sc6v3ff366796cas6ngz30vb1fhkqvdi5mkxkv"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0wznldd70f4iybkaar23342xm9nfh3g9lqankbrv1bvy7nbrrl47"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "05bb0h54a3k9fjkwzcj4kky9xfv7li3p7lfp35f7cv1mab21yqhv"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0pdyf0m2jvxzp4qp6r9sbxxssnrpbcw9vv3yhjqiajg4zv537g8f"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "0a3caj9x9lk942kwr6pr6flxbgrjagnn7h9f5hspsb59q08hya8c"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0zzppp00mvj6y6jfc5ivz6816ab524q8h9h38r4ggrhlswfdqapx"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "0y9kcx7pd1swjhb4skhhj35g11mi0gcm9hfmy0v1llk3cwap95nl"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "19rn0glqnnip0iybcnk48z1rxb2r1nnpka0cskv3phq1aachyh46"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "1skysk6c4flz9x7q7y3vrnwg2hyq7cap0f86qvvw1bgpsf3iqp85"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "1vyyhwmz9996igq74cbivr27xl4gnxnrpd64zgykrxdmiz7wrrh8"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "112i3pbcp6hbjaisz0qwqkq12hpf2xrhv70l06ifgxz6ndpi91s6"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0bq4x765vglp84l0sak1xzzazj4kcgqjb1l30ywqy6rfylb2ppz5"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "1zpm26zd654jhl1a12dcsq1ml0nc0nl3w9ff3inp5l6da82cd6rz"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0jxnicdqqkbm32wbyfm7d4c6i522701jagjpl6vsdv9q3i5a44vg"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "1wz04jh2nphs9yvi8zcm0m787wjxgpss3bc8zpmihw17qxwsx9dz"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "1q6k2wa6xknh7v097gl7wx7k1jw6s86fcrl04zxbm4n2s4av59wx"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "15nnv3q2zbqn8jyj3sr97ms31kiwg7660bzdzmch62hagbqggjjj"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0ajsb8dzidmrhch2j6wdv30c9k79q46lr7zy4v41336423rw867h"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "0dba0d4c2ays2vnk14wd0y2dl72vvqqx99ld2h3ihv38l37idv9z"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "1467pgxdbm6mnf0nqdcf0sarfcwsp0zdazxbk49lcriid87kiyih"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "164irrjzcnjzkz0lx5j9hi21mgmp4v4cmb26k961wha68v1z4xcg"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "06bkz36xj5gn3djllbzmzccqagawib988b092gghngibg9fxshlw"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "1s7rjmlvj1j2cy0hd3bvxc8h49vi1vmcm7a00qkv09qdll8varac"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.10"; sha256 = "11xczi5f9b52hsi0004wx6f5sj2rc2x5kdh5g3ngg3qj3bcqki8r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.10"; sha256 = "06m28k55v8zjxj2jql38c3j2qsmr0ykgrpv5rf7yvb5v83v7l6js"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.10"; sha256 = "0idli8p2n1xs5d1d31c692bmmxxkxc3rmywhak6y2kq29d5lrd2i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.10"; sha256 = "1qr5l2zcv0m9w8xwm2jsk32xzfmszz5v3g6w6px8k5v6cxysaq69"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.10"; sha256 = "0jm1kmpy5d45svdzn8a29jaxjvw767j338vda2prmnyf2gngikw7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.10"; sha256 = "1apbhxqq6xnzs3ag8gflwzymb9g6rs19i1kdbds0pp08hviy7gmp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.10"; sha256 = "14dj7ybbmks7qdih6l7ph052v1yjx7hk6c3s42vwnccvpg06sj1l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.10"; sha256 = "16s4c1ix3sqqgdc6f2v0ldlw442l2k1c2ybjhkbsspq6pp9xsshj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.10"; sha256 = "1bms1r0g7acrg7698zws61qswv80n4d79wjxa4r3v6552w4mriwr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.10"; sha256 = "0yiffw2rcbi9014ngjzqnkp0969gsxnmn9csd921dacrls31fc9h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.10"; sha256 = "16zifcd3c5xwipvfx3lfva6zk45g6119anlmjlybn8p0i6vgdfly"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.10"; sha256 = "0bk0hmys42l5wsk6zvgjcj7aynmdymlvc7fmwmffg3z53i4crz0i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.10"; sha256 = "0y3c6nq9i8d5brsx1wm355bhhcs1kha4aln1aa76bqaj2rhh0j76"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.10"; sha256 = "16z135yy8xlbbxi2kcmxcqa5s2haysc9f0d998xmwvm3lgpxb76q"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "058vcvc61pidfrpj6zi1hy04ywfrdmczgsrigih23irlhsr7pdh8"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "1hpx1pav1kdlk8asvkskhzqkq47ys0mq8m0bk5vs22ccb9iqkr7m"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "01gigb8p5m85jmp3hc94mb3nmy3bvw0hpjbsls42rxai3v4sx73g"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "1xlzpfzzg4vna9dh75ifli8x5g4jfj6kqkisqx13f0hdzzcj69hx"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0m4fy8q94ssrsfx3ww9k0rqic9rk8dir7iryrlsbxhqvmp4gwvdh"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "039k2aaaadqr90gpih74mzws8v00ravaz77fy6lp6c37wqqs47sa"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0zayq28xgj2461h10vrj7mp8qmsffzajj8rr1whkx1kkbw9qb54r"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "01xprbf02jkb50k0r198q12924nya5s60j4v089436yhxy6g48jf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.10"; sha256 = "096dcwdj68sma7b9kf0wvpxli3w746hl56i2vjwdhgf83hr3g6k3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.10"; sha256 = "1jh5mfjybj2z1wn8pf1fm0bllanlmd8khipz965pgxzwarfv3n43"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.10"; sha256 = "0rwdz654c4yd20rnk8hqhai4d7v4xybyigs84qyyxk4w0kp2bz1g"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.10"; sha256 = "0qyqxp46mv695aiq27vvlwjz71mcsavagnlzmfbpn0310y285bnh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.10"; sha256 = "0y5b4vrnyxg87v64yypbcbcmj4mqmxvqc4nriqck7ssc022l5rgz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.10"; sha256 = "1bw2d400qdk2v969w8rl2y1r0090m8h5bzx1r48mn6lpz6wvs6ld"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.10"; sha256 = "0rnj3jl6yzpg08aw7802qs5s7bfw1vqx24604aizhkhbscf8f4f3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.10"; sha256 = "06cydadly53jaslvaa9q7jzsyc9fqbd68a2av3ncybl1cngawz9i"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "1kr2ib8kskdp94ckx9bfahwhj6wv48bhck6xy8wgb5d8j8q9mqam"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "1mi8yn7gfv3i01iqgrrsnf7cni1jip13j0b51lrl752pkzv3lynv"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "15ar1vz3wq2pncv964dkcci5mlc1kf2pw8zbyr7ayjyfjhr2nxrj"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "120c4nalbj046bs0q2wg7pxsjgdwazbbjnrs76v0sscwzzaylc01"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "03q8z4lrm538wrsv4isfhzwlxffcngykv45wp58gbg338gxh4ngw"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "1gcqrsindn2avrp4r3lj0bsi4hda0zimmwhicihkh2ykq5xxjyj3"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "1nlkr2yf1rxb0jca5li44br4n95hsmbaxg3wf2nz0iyh4n7b65kw"; }) ]; }; } From cb686eeb00c8d0e270f90adbd915564139baad4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 06:34:08 +0000 Subject: [PATCH 075/134] ibus-engines.typing-booster-unwrapped: 2.23.4 -> 2.24.0 --- .../inputmethods/ibus-engines/ibus-typing-booster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 22294b19820a..0ce6215b4964 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.23.4"; + version = "2.24.0"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-QVOcIpqdMTGQgqhBBbkA1UKyVKNGqkWzOVCVSLC5ecA="; + hash = "sha256-C9RUkA/gb3jhRGfYXX6rzCnYenSkAVdNvR1+O0u9Av8="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; From 9acbef97fa4f1b2255808a0b750021936d1343b7 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Fri, 8 Sep 2023 08:55:44 +0200 Subject: [PATCH 076/134] crun: 1.8.7 -> 1.9 Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/crun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index ae2388dd18a8..5ea6bdc8dd32 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.8.7"; + version = "1.9"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - hash = "sha256-+EHkbAltoYzlDIgMbH3ofhpBLJhv5lq72u7Hh7cpU/M="; + hash = "sha256-1Ygr4tnMCRsskeJMUFv2XJxnNak8E30jZDZiLkXAQyg="; fetchSubmodules = true; }; From 1171ea9cc2a023858922cd1f4bdfe20052d52759 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Sep 2023 09:02:49 +0200 Subject: [PATCH 077/134] exploitdb: 2023-09-07 -> 2023-09-08 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-09-07...2023-09-08 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 1ef55fd7562a..41055fdba551 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-09-07"; + version = "2023-09-08"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8NQkGArCTd/fGhqK8xMAxmUYnYLZ6tSRkkAL3KeN6NE="; + hash = "sha256-5KH6B205WBJLyIAifWB7uA/LPy6dJC/xaryD6XsZCyc="; }; nativeBuildInputs = [ From 6d208146f8b4ed6ca7f2793a6e729147a2e62897 Mon Sep 17 00:00:00 2001 From: thenbe <33713262+thenbe@users.noreply.github.com> Date: Fri, 8 Sep 2023 07:11:54 +0000 Subject: [PATCH 078/134] brotab: add missing dependency `setuptools` --- pkgs/tools/misc/brotab/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/brotab/default.nix b/pkgs/tools/misc/brotab/default.nix index ce2effb25ce7..9a58c83ae303 100644 --- a/pkgs/tools/misc/brotab/default.nix +++ b/pkgs/tools/misc/brotab/default.nix @@ -25,6 +25,7 @@ python.pkgs.buildPythonApplication rec { flask psutil requests + setuptools ]; postPatch = '' From 29c7ce56873f050560f90bd99c116f1334d4723c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 07:17:54 +0000 Subject: [PATCH 079/134] toybox: 0.8.9 -> 0.8.10 --- pkgs/tools/misc/toybox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 7a062eb35efa..07ad33645849 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -12,13 +12,13 @@ in stdenv.mkDerivation rec { pname = "toybox"; - version = "0.8.9"; + version = "0.8.10"; src = fetchFromGitHub { owner = "landley"; repo = pname; rev = version; - sha256 = "sha256-3boPoq/wm0af0DqEWcUCUyCmVFopVMitRHJI1xsjAWM="; + sha256 = "sha256-MMkNLhQP3ztWoRYhCU/cNXE/M+/ny41OK1SA9oM/lZg="; }; depsBuildBuild = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc ]; From 0342a5194b62f5c5375dbae9f065cb33722dc466 Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Tue, 25 Jul 2023 01:22:45 -0700 Subject: [PATCH 080/134] jupyter-console: expose as a tool for launching kernels --- .../jupyter-kernels/clojupyter/default.nix | 7 ++- .../editors/jupyter-kernels/iruby/default.nix | 47 ++++++++++++++----- .../jupyter-kernels/octave/default.nix | 7 ++- .../jupyter-kernels/wolfram/default.nix | 8 +++- pkgs/applications/editors/jupyter/console.nix | 37 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 91 insertions(+), 17 deletions(-) create mode 100644 pkgs/applications/editors/jupyter/console.nix diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix index 504d41768868..5acca288f963 100644 --- a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix @@ -8,8 +8,11 @@ , imagemagick }: -# To test: -# $(nix-build --no-out-link -E 'with import {}; jupyter.override { definitions = { clojure = clojupyter.definition; }; }')/bin/jupyter-notebook +# Jupyter console: +# nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel clojupyter.definition' + +# Jupyter notebook: +# nix run --impure --expr 'with import {}; jupyter.override { definitions.clojure = clojupyter.definition; }' let cljdeps = import ./deps.nix { inherit pkgs; }; diff --git a/pkgs/applications/editors/jupyter-kernels/iruby/default.nix b/pkgs/applications/editors/jupyter-kernels/iruby/default.nix index 260a614fe5c0..f456d469ca36 100644 --- a/pkgs/applications/editors/jupyter-kernels/iruby/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/iruby/default.nix @@ -2,16 +2,41 @@ , bundlerApp }: -bundlerApp { - pname = "iruby"; - gemdir = ./.; - exes = [ "iruby" ]; +# Jupyter console: +# nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel iruby.definition' - meta = with lib; { - description = "Ruby kernel for Jupyter"; - homepage = "https://github.com/SciRuby/iruby"; - license = licenses.mit; - maintainers = [ maintainers.costrouc ]; - platforms = platforms.unix; +# Jupyter notebook: +# nix run --impure --expr 'with import {}; jupyter.override { definitions.iruby = iruby.definition; }' + +let + self = bundlerApp { + pname = "iruby"; + gemdir = ./.; + exes = [ "iruby" ]; + + passthru = { + definition = { + displayName = "IRuby"; + argv = [ + "${self}/bin/iruby" + "kernel" + "{connection_file}" + ]; + language = "ruby"; + logo32 = null; + logo64 = null; + }; + }; + + meta = { + description = "Ruby kernel for Jupyter"; + homepage = "https://github.com/SciRuby/iruby"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ costrouc thomasjm ]; + platforms = lib.platforms.unix; + }; }; -} + +in + +self diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix index a9770a5c1bef..88bc1b2803bb 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -7,8 +7,11 @@ , python3 }: -# To test: -# $(nix-build -E 'with import {}; jupyter.override { definitions = { octave = octave-kernel.definition; }; }')/bin/jupyter-notebook +# Jupyter console: +# nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel octave-kernel.definition' + +# Jupyter notebook: +# nix run --impure --expr 'with import {}; jupyter.override { definitions.octave = octave-kernel.definition; }' let kernel = callPackage ./kernel.nix { diff --git a/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix b/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix index 2d00d6e1fc2e..efa78f74bc96 100644 --- a/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix @@ -2,8 +2,12 @@ , wolfram-engine }: -# To test: -# $(nix-build -E 'with import ./. {}; jupyter.override { definitions = { wolfram = wolfram-for-jupyter-kernel.definition; }; }')/bin/jupyter-notebook +# Jupyter console: +# nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel wolfram-for-jupyter-kernel.definition' + +# Jupyter notebook: +# nix run --impure --expr 'with import {}; jupyter.override { definitions.wolfram = wolfram-for-jupyter-kernel.definition; }' + let kernel = callPackage ./kernel.nix {}; in { definition = { diff --git a/pkgs/applications/editors/jupyter/console.nix b/pkgs/applications/editors/jupyter/console.nix new file mode 100644 index 000000000000..06bc82a1780b --- /dev/null +++ b/pkgs/applications/editors/jupyter/console.nix @@ -0,0 +1,37 @@ +{ python3 +, jupyter-kernel +, lib +}: + +let + mkConsole = { + definitions ? jupyter-kernel.default + , kernel ? null + }: + (python3.buildEnv.override { + extraLibs = [ python3.pkgs.jupyter-console ]; + makeWrapperArgs = [ + "--set JUPYTER_PATH ${jupyter-kernel.create { inherit definitions; }}" + ] ++ lib.optionals (kernel != null) [ + "--add-flags --kernel" + "--add-flags ${kernel}" + ]; + }).overrideAttrs (oldAttrs: { + # To facilitate running nix run .#jupyter-console + meta = oldAttrs.meta // { mainProgram = "jupyter-console"; }; + }); + +in + +{ + # Build a console derivation with an arbitrary set of definitions, and an optional kernel to use. + # If the kernel argument is not supplied, Jupyter console will pick a kernel to run from the ones + # available on the system. + inherit mkConsole; + + # An ergonomic way to start a console with a single kernel. + withSingleKernel = definition: mkConsole { + definitions = lib.listToAttrs [(lib.nameValuePair definition.language definition)]; + kernel = definition.language; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 413c1738a557..79f9fd3b51c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9663,6 +9663,8 @@ with pkgs; }; }; + jupyter-console = callPackage ../applications/editors/jupyter/console.nix { }; + jupyter-kernel = callPackage ../applications/editors/jupyter/kernel.nix { }; justify = callPackage ../tools/text/justify { }; From 3c3299bdc2d866c5b3d3d13f98f52d1c7743bd9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 07:33:07 +0000 Subject: [PATCH 081/134] jotta-cli: 0.15.84961 -> 0.15.89752 --- pkgs/applications/misc/jotta-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index f507658d154e..40ece54ab1ed 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.15.84961"; + version = "0.15.89752"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "sha256-ay2YEtvGF93QAcpszxIiKRkrHGE02u80ujhMT39KD7Y="; + sha256 = "sha256-vYI9jbY2npPrmP0lMRSbLneVbQvQVsL0plM5jOvtdzA="; stripRoot = false; }; From fd18c9fb9d85f2cf33d04f1f94f9fe8174a30ede Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 07:43:01 +0000 Subject: [PATCH 082/134] python310Packages.nvidia-ml-py: 12.535.77 -> 12.535.108 --- pkgs/development/python-modules/nvidia-ml-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix index 8894de41d561..caf4028df577 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "nvidia-ml-py"; - version = "12.535.77"; + version = "12.535.108"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-jYHl7Zk8hABkVBAq+ExL/99yulxRIStsASHGVoiYPhQ="; + hash = "sha256-FB/oGHcaFl+5P3Xb5/Afdnw7r6fBP2h29TWDURsHjuE="; }; patches = [ From 1e6c8f18cb35305cf6fa6b79cb3a4ed18d907af1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 08:00:54 +0000 Subject: [PATCH 083/134] dolt: 1.8.8 -> 1.14.0 --- 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 4c863e1eb26e..f910f1651d2f 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.8.8"; + version = "1.14.0"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-wsSSUd3i3PXEQfvpstcNXM9PK4K/Uw/xcT5Iu0vRKqQ="; + sha256 = "sha256-dLIT0EPtz1a1v48axT1xRcgKGJwXFjNnzu5eUzF4QXw="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-bLqoitXf4O2WFkArkvm3IeeKU8XQpSIicWwDD4aOWrg="; + vendorHash = "sha256-s9ACHwgdElFqmgnryVsKfVFqoy153prtyJx03qNI/KU="; proxyVendor = true; doCheck = false; From 82ea1d463128e5f1716fee180beab1371a6cc8c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Sep 2023 10:05:15 +0200 Subject: [PATCH 084/134] python311Packages.dbus-fast: 1.95.0 -> 1.95.1 Changelog: https://github.com/Bluetooth-Devices/dbus-fast/releases/tag/v1.95.1 --- pkgs/development/python-modules/dbus-fast/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 5bc4a9ab79a8..2d15f7f6aa30 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.95.0"; + version = "1.95.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1Qi1pV92V1EIDU/kLhwPhr3Sa92xvcrpHUA36KfzM6w="; + hash = "sha256-Zj4wpGfcNM9UVehs2bhF5IyujVI6jegnoMaLMbcvTOA="; }; # The project can build both an optimized cython version and an unoptimized @@ -71,6 +71,7 @@ buildPythonPackage rec { "test_interface_add_remove_signal" "test_introspectable_interface" "test_methods" + "test_multiple_flags_in_message" "test_name_requests" "test_object_manager" "test_peer_interface" From c6915a43902b3f5d7e52bb5ad172173614cb4b21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 08:08:55 +0000 Subject: [PATCH 085/134] exoscale-cli: 1.72.1 -> 1.72.2 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 43c114d0940d..93c7c5fb0755 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "exoscale-cli"; - version = "1.72.1"; + version = "1.72.2"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-WaM0GQP5JIGKJuRPcIqaPt98qkjRuzjbv6oiHARu6lA="; + sha256 = "sha256-EUHjkhorfqRPStwThO5rdBVtl+NltEv18Bno4zu+5Us="; }; vendorHash = null; From 7539360ce3c64cd6a71fb9ff63d96a265c39e5df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Sep 2023 10:09:00 +0200 Subject: [PATCH 086/134] python311Packages.dbus-fast: 1.95.1 -> 1.95.2 Changelog: https://github.com/Bluetooth-Devices/dbus-fast/releases/tag/v1.95.2 --- pkgs/development/python-modules/dbus-fast/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 2d15f7f6aa30..da46ca99d6db 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.95.1"; + version = "1.95.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Zj4wpGfcNM9UVehs2bhF5IyujVI6jegnoMaLMbcvTOA="; + hash = "sha256-odx+2TfyPcVk43wVtArQ5CnR/69WxYf7O6QSYRq/M9I="; }; # The project can build both an optimized cython version and an unoptimized @@ -66,6 +66,7 @@ buildPythonPackage rec { "test_export_alias" "test_export_introspection" "test_export_unexport" + "test_fast_disconnect" "test_glib_big_message" "test_high_level_service_fd_passing" "test_interface_add_remove_signal" From 5265e8864a7006b8d441fce343a4f3812bd5a6fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 08:33:27 +0000 Subject: [PATCH 087/134] mssql_jdbc: 12.4.0 -> 12.4.1 --- pkgs/servers/sql/mssql/jdbc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix index 5c4cb9f13a30..efa3089e47c7 100644 --- a/pkgs/servers/sql/mssql/jdbc/default.nix +++ b/pkgs/servers/sql/mssql/jdbc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mssql-jdbc"; - version = "12.4.0"; + version = "12.4.1"; src = fetchurl { url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar"; - sha256 = "sha256-j9y2czUOVKJigtOsv/B+wQYSVPoKPbb5hLvv0Q3suzs="; + sha256 = "sha256-Ci59MLU50Dl+rmUstX7c/BdAJJ/GCCYLqcyrxGr2g7E="; }; dontUnpack = true; From 89261204b6a46929f9c6e2cf7e2281c7a2d1c5d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 08:35:29 +0000 Subject: [PATCH 088/134] zigbee2mqtt: 1.32.2 -> 1.33.0 --- pkgs/servers/zigbee2mqtt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 887695d1449d..5e310cda8c95 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.32.2"; + version = "1.33.0"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-ghJMSWb2bYtJhthV7KOLn9q1Tf3dCtBCCDrnjlen5JU="; + hash = "sha256-DdRcDSvgFf+NSDpWT4MnAOLNJ5sfqvJqKBhfPwTHd/g="; }; - npmDepsHash = "sha256-2OjUBOCaVFU7Ct1n15AHm6QmzsIaGtti8zsElXcVSA8="; + npmDepsHash = "sha256-ov1ftDqJtxLCu3xgtGcg+Q2OMkOsHrwk1SNNfdlUieY="; nativeBuildInputs = [ python3 From 83b955f828f46061da86e8c334518f99e71ab431 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Sep 2023 10:38:09 +0200 Subject: [PATCH 089/134] python311Packages.dbus-fast: 1.95.2 -> 2.0.0 Diff: https://github.com/Bluetooth-Devices/dbus-fast/compare/refs/tags/v1.95.2...v2.0.0 Changelog: https://github.com/Bluetooth-Devices/dbus-fast/releases/tag/v2.0.0 --- pkgs/development/python-modules/dbus-fast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index da46ca99d6db..bec651629d7f 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.95.2"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-odx+2TfyPcVk43wVtArQ5CnR/69WxYf7O6QSYRq/M9I="; + hash = "sha256-Dzr7CSoJhO/F75Ro686lKXCOzP2AxtR6wJOp70IOvUk="; }; # The project can build both an optimized cython version and an unoptimized From d056e2a92bab392ada4d3f64affc47ee720f6284 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 08:50:55 +0000 Subject: [PATCH 090/134] imgui: 1.89.8 -> 1.89.9 --- pkgs/development/libraries/imgui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 4ed5cc06cf0a..ca7a47d36385 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.89.8"; + version = "1.89.9"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-pkEm7+ZBYAYgAbMvXhmJyxm6DfyQWkECTXcTHTgfvuo="; + sha256 = "sha256-0k9jKrJUrG9piHNFQaBBY3zgNIKM23ZA879NY+MNYTU="; }; dontBuild = true; From e381dfc8156f4201ba9f7695704562cea033788a Mon Sep 17 00:00:00 2001 From: Sebastian Zivota Date: Fri, 8 Sep 2023 10:57:11 +0200 Subject: [PATCH 091/134] sentry-cli: 2.20.5 -> 2.20.7 --- pkgs/development/tools/sentry-cli/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 702e8c803977..5f7fa29befab 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.20.5"; + version = "2.20.7"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-gV1IL2IKbmUeOJkMfJ3Hd8xoylVi0i7ADdxaISLF+wM="; + sha256 = "sha256-H1WRjNMYcWqc9Y8H7agzA7uMhvlA4DXpJOUpbUG+xxU="; }; doCheck = false; @@ -25,13 +25,13 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-9L+wfYO5BOkpB3VqUSOJEwq671SVGlWcbXd80m/UoYI="; + cargoHash = "sha256-WLnvyQQ51dIsD5g3FjHJhA+EqB1UEHghwxI/TVYwNdo="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; license = licenses.bsd3; description = "A command line utility to work with Sentry"; changelog = "https://github.com/getsentry/sentry-cli/raw/${version}/CHANGELOG.md"; - maintainers = with maintainers; [ rizary ]; + maintainers = with maintainers; [ rizary loewenheim ]; }; } From b24287dde88c21108880d08bdd5dbc03240bd900 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Sep 2023 13:36:32 +0200 Subject: [PATCH 092/134] home-assistant: 2023.8.4 -> 2023.9.0 https://github.com/home-assistant/core/releases/tag/2023.9.0 --- .../home-assistant/component-packages.nix | 64 +++++++++- pkgs/servers/home-assistant/default.nix | 6 +- pkgs/servers/home-assistant/frontend.nix | 4 +- .../home-assistant/patches/ffmpeg-path.patch | 120 +++++++++--------- pkgs/servers/home-assistant/tests.nix | 8 ++ 5 files changed, 132 insertions(+), 70 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index eec014491376..78829b1b0014 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.8.4"; + version = "2023.9.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -638,6 +638,9 @@ ]; "comed_hourly_pricing" = ps: with ps; [ ]; + "comelit" = ps: with ps; [ + aiocomelit + ]; "comfoconnect" = ps: with ps; [ pycomfoconnect ]; @@ -648,6 +651,8 @@ ]; "concord232" = ps: with ps; [ ]; # missing inputs: concord232 + "coned" = ps: with ps; [ + ]; "config" = ps: with ps; [ aiohttp-cors ]; @@ -1049,7 +1054,7 @@ enocean ]; "enphase_envoy" = ps: with ps; [ - envoy-reader + pyenphase ]; "entur_public_transport" = ps: with ps; [ enturclient @@ -1678,6 +1683,25 @@ ]; "homeassistant_alerts" = ps: with ps; [ ]; + "homeassistant_green" = ps: with ps; [ + aiohttp-cors + bellows + fnv-hash-fast + janus + pillow + psutil-home-assistant + pyserial + pyserial-asyncio + pyudev + sqlalchemy + universal-silabs-flasher + zha-quirks + zigpy + zigpy-deconz + zigpy-xbee + zigpy-zigate + zigpy-znp + ]; "homeassistant_hardware" = ps: with ps; [ aiohttp-cors bellows @@ -1689,6 +1713,7 @@ pyserial-asyncio pyudev sqlalchemy + universal-silabs-flasher zha-quirks zigpy zigpy-deconz @@ -1707,6 +1732,7 @@ pyserial-asyncio pyudev sqlalchemy + universal-silabs-flasher zha-quirks zigpy zigpy-deconz @@ -1725,6 +1751,7 @@ pyserial-asyncio pyudev sqlalchemy + universal-silabs-flasher zha-quirks zigpy zigpy-deconz @@ -2183,6 +2210,8 @@ "laundrify" = ps: with ps; [ laundrify-aio ]; + "lawn_mower" = ps: with ps; [ + ]; "lcn" = ps: with ps; [ pypck ]; @@ -2988,6 +3017,8 @@ ]; "oru" = ps: with ps; [ ]; # missing inputs: oru + "oru_opower" = ps: with ps; [ + ]; "orvibo" = ps: with ps; [ orvibo ]; @@ -3007,6 +3038,7 @@ python-otbr-api pyudev sqlalchemy + universal-silabs-flasher zeroconf zha-quirks zigpy @@ -3445,7 +3477,8 @@ rtsp-to-webrtc ]; "ruckus_unleashed" = ps: with ps; [ - pyruckus + aioruckus + xmltodict ]; "russound_rio" = ps: with ps; [ ]; # missing inputs: russound-rio @@ -3537,6 +3570,9 @@ ]; "schedule" = ps: with ps; [ ]; + "schlage" = ps: with ps; [ + pyschlage + ]; "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter "scrape" = ps: with ps; [ @@ -4321,6 +4357,9 @@ pytradfri ] ++ pytradfri.optional-dependencies.async; + "trafikverket_camera" = ps: with ps; [ + pytrafikverket + ]; "trafikverket_ferry" = ps: with ps; [ pytrafikverket ]; @@ -4505,6 +4544,9 @@ "vlc_telnet" = ps: with ps; [ aiovlc ]; + "vodafone_station" = ps: with ps; [ + aiovodafone + ]; "voicerss" = ps: with ps; [ ]; "voip" = ps: with ps; [ @@ -4534,11 +4576,13 @@ "wake_on_lan" = ps: with ps; [ wakeonlan ]; + "wake_word" = ps: with ps; [ + ]; "wallbox" = ps: with ps; [ wallbox ]; "waqi" = ps: with ps; [ - waqiasync + aiowaqi ]; "water_heater" = ps: with ps; [ ]; @@ -4551,7 +4595,7 @@ aiowatttime ]; "waze_travel_time" = ps: with ps; [ - wazeroutecalculator + pywaze ]; "weather" = ps: with ps; [ ]; @@ -4729,6 +4773,8 @@ ]; "yandextts" = ps: with ps; [ ]; + "yardian" = ps: with ps; [ + ]; # missing inputs: pyyardian "yeelight" = ps: with ps; [ aiohttp-cors async-upnp-client @@ -4797,6 +4843,7 @@ pyserial-asyncio pyudev sqlalchemy + universal-silabs-flasher zha-quirks zigpy zigpy-deconz @@ -4929,6 +4976,7 @@ "cloudflare" "co2signal" "color_extractor" + "comelit" "comfoconnect" "command_line" "compensation" @@ -5098,6 +5146,7 @@ "home_plus_control" "homeassistant" "homeassistant_alerts" + "homeassistant_green" "homeassistant_hardware" "homeassistant_sky_connect" "homeassistant_yellow" @@ -5169,6 +5218,7 @@ "lastfm" "launch_library" "laundrify" + "lawn_mower" "lcn" "ld2410_ble" "led_ble" @@ -5378,6 +5428,7 @@ "samsungtv" "scene" "schedule" + "schlage" "scrape" "screenlogic" "script" @@ -5497,6 +5548,7 @@ "trace" "tractive" "tradfri" + "trafikverket_camera" "trafikverket_ferry" "trafikverket_train" "trafikverket_weatherstation" @@ -5537,12 +5589,14 @@ "vilfo" "vizio" "vlc_telnet" + "vodafone_station" "voicerss" "volumio" "volvooncall" "vulcan" "vultr" "wake_on_lan" + "wake_word" "wallbox" "water_heater" "watttime" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c6f7703718ed..76450b9d4ed9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -296,7 +296,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.8.4"; + hassVersion = "2023.9.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -312,7 +312,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-Mu3DyCtF/bTrTvRKPLVEGSZfWZrF7QQy/ZvBi5IIH3s="; + hash = "sha256-XdZYVv60ZCkK0fKmt2kmThRxhv+hfJMtHwgBu3iaW9w="; }; # Secondary source is git for tests @@ -320,7 +320,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-N06e2QSt34l4T0hulndZR/czjaPcmw8YXF0iAN/XmgQ="; + hash = "sha256-B+GdUXRvQyBMR7PbVGEZr7hZm7wslBskUTB23APJLIU="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 249559bf083c..72da8c22120d 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230802.1"; + version = "20230906.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-kG2FGX78pd1vbRH6DtB2rXV0AlcUfaHO0z5Vft0hswE="; + hash = "sha256-wR/v49K4bKNnzkRltvdFjVYgZ+jU8PVBJHCF765NY5U="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/patches/ffmpeg-path.patch b/pkgs/servers/home-assistant/patches/ffmpeg-path.patch index a4177a35f484..8a83618b1a4b 100644 --- a/pkgs/servers/home-assistant/patches/ffmpeg-path.patch +++ b/pkgs/servers/home-assistant/patches/ffmpeg-path.patch @@ -11,11 +11,69 @@ index a98766c78c..1c47bb1f80 100644 CONFIG_SCHEMA = vol.Schema( { +diff --git a/tests/components/ffmpeg/test_binary_sensor.py b/tests/components/ffmpeg/test_binary_sensor.py +index 6eec115d6f..c55b4fb26c 100644 +--- a/tests/components/ffmpeg/test_binary_sensor.py ++++ b/tests/components/ffmpeg/test_binary_sensor.py +@@ -24,7 +24,7 @@ async def test_noise_setup_component(hass: HomeAssistant) -> None: + await async_setup_component(hass, "binary_sensor", CONFIG_NOISE) + await hass.async_block_till_done() + +- assert hass.data["ffmpeg"].binary == "ffmpeg" ++ assert hass.data["ffmpeg"].binary == "@ffmpeg@" + assert hass.states.get("binary_sensor.ffmpeg_noise") is not None + + +@@ -35,7 +35,7 @@ async def test_noise_setup_component_start(mock_start, hass: HomeAssistant): + await async_setup_component(hass, "binary_sensor", CONFIG_NOISE) + await hass.async_block_till_done() + +- assert hass.data["ffmpeg"].binary == "ffmpeg" ++ assert hass.data["ffmpeg"].binary == "@ffmpeg@" + assert hass.states.get("binary_sensor.ffmpeg_noise") is not None + + hass.bus.async_fire(EVENT_HOMEASSISTANT_START) +@@ -55,7 +55,7 @@ async def test_noise_setup_component_start_callback(mock_ffmpeg, hass: HomeAssis + await async_setup_component(hass, "binary_sensor", CONFIG_NOISE) + await hass.async_block_till_done() + +- assert hass.data["ffmpeg"].binary == "ffmpeg" ++ assert hass.data["ffmpeg"].binary == "@ffmpeg@" + assert hass.states.get("binary_sensor.ffmpeg_noise") is not None + + hass.bus.async_fire(EVENT_HOMEASSISTANT_START) +@@ -80,7 +80,7 @@ async def test_motion_setup_component(hass: HomeAssistant) -> None: + await async_setup_component(hass, "binary_sensor", CONFIG_MOTION) + await hass.async_block_till_done() + +- assert hass.data["ffmpeg"].binary == "ffmpeg" ++ assert hass.data["ffmpeg"].binary == "@ffmpeg@" + assert hass.states.get("binary_sensor.ffmpeg_motion") is not None + + +@@ -91,7 +91,7 @@ async def test_motion_setup_component_start(mock_start, hass: HomeAssistant): + await async_setup_component(hass, "binary_sensor", CONFIG_MOTION) + await hass.async_block_till_done() + +- assert hass.data["ffmpeg"].binary == "ffmpeg" ++ assert hass.data["ffmpeg"].binary == "@ffmpeg@" + assert hass.states.get("binary_sensor.ffmpeg_motion") is not None + + hass.bus.async_fire(EVENT_HOMEASSISTANT_START) +@@ -111,7 +111,7 @@ async def test_motion_setup_component_start_callback(mock_ffmpeg, hass: HomeAssi + await async_setup_component(hass, "binary_sensor", CONFIG_MOTION) + await hass.async_block_till_done() + +- assert hass.data["ffmpeg"].binary == "ffmpeg" ++ assert hass.data["ffmpeg"].binary == "@ffmpeg@" + assert hass.states.get("binary_sensor.ffmpeg_motion") is not None + + hass.bus.async_fire(EVENT_HOMEASSISTANT_START) diff --git a/tests/components/ffmpeg/test_init.py b/tests/components/ffmpeg/test_init.py -index 521ac732e5..ab8a56934f 100644 +index 0c6ce300d0..ff74a5d7f7 100644 --- a/tests/components/ffmpeg/test_init.py +++ b/tests/components/ffmpeg/test_init.py -@@ -87,7 +87,7 @@ class TestFFmpegSetup: +@@ -91,7 +91,7 @@ class TestFFmpegSetup: with assert_setup_component(1): setup_component(self.hass, ffmpeg.DOMAIN, {ffmpeg.DOMAIN: {}}) @@ -24,61 +82,3 @@ index 521ac732e5..ab8a56934f 100644 def test_setup_component_test_service(self): """Set up ffmpeg component test services.""" -diff --git a/tests/components/ffmpeg/test_sensor.py b/tests/components/ffmpeg/test_sensor.py -index a6c9c1f441..f13091da1a 100644 ---- a/tests/components/ffmpeg/test_sensor.py -+++ b/tests/components/ffmpeg/test_sensor.py -@@ -27,7 +27,7 @@ class TestFFmpegNoiseSetup: - setup_component(self.hass, "binary_sensor", self.config) - self.hass.block_till_done() - -- assert self.hass.data["ffmpeg"].binary == "ffmpeg" -+ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@" - assert self.hass.states.get("binary_sensor.ffmpeg_noise") is not None - - @patch("haffmpeg.sensor.SensorNoise.open_sensor", return_value=mock_coro()) -@@ -37,7 +37,7 @@ class TestFFmpegNoiseSetup: - setup_component(self.hass, "binary_sensor", self.config) - self.hass.block_till_done() - -- assert self.hass.data["ffmpeg"].binary == "ffmpeg" -+ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@" - assert self.hass.states.get("binary_sensor.ffmpeg_noise") is not None - - self.hass.start() -@@ -53,7 +53,7 @@ class TestFFmpegNoiseSetup: - setup_component(self.hass, "binary_sensor", self.config) - self.hass.block_till_done() - -- assert self.hass.data["ffmpeg"].binary == "ffmpeg" -+ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@" - assert self.hass.states.get("binary_sensor.ffmpeg_noise") is not None - - self.hass.start() -@@ -89,7 +89,7 @@ class TestFFmpegMotionSetup: - setup_component(self.hass, "binary_sensor", self.config) - self.hass.block_till_done() - -- assert self.hass.data["ffmpeg"].binary == "ffmpeg" -+ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@" - assert self.hass.states.get("binary_sensor.ffmpeg_motion") is not None - - @patch("haffmpeg.sensor.SensorMotion.open_sensor", return_value=mock_coro()) -@@ -99,7 +99,7 @@ class TestFFmpegMotionSetup: - setup_component(self.hass, "binary_sensor", self.config) - self.hass.block_till_done() - -- assert self.hass.data["ffmpeg"].binary == "ffmpeg" -+ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@" - assert self.hass.states.get("binary_sensor.ffmpeg_motion") is not None - - self.hass.start() -@@ -115,7 +115,7 @@ class TestFFmpegMotionSetup: - setup_component(self.hass, "binary_sensor", self.config) - self.hass.block_till_done() - -- assert self.hass.data["ffmpeg"].binary == "ffmpeg" -+ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@" - assert self.hass.states.get("binary_sensor.ffmpeg_motion") is not None - - self.hass.start() diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 154f8dc2f279..f2c904467852 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -39,6 +39,14 @@ let }; extraDisabledTests = { + mqtt = [ + # Assert None is not None + "test_handle_logging_on_writing_the_entity_state" + ]; + shell_command = [ + # tries to retrieve file from github + "test_non_text_stdout_capture" + ]; vesync = [ # homeassistant.components.vesync:config_validation.py:863 The 'vesync' option has been removed, please remove it from your configuration "test_async_get_config_entry_diagnostics__single_humidifier" From 4deda2a9c8768ee52ac6ffc262d94bbb46596cab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Sep 2023 13:38:35 +0200 Subject: [PATCH 093/134] python310Packages.pyruckus: remove Depreated in favor of aioruckus, and home-assistant, its only consumer in nixpkgs, has already moved on. --- .../python-modules/pyruckus/default.nix | 36 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/development/python-modules/pyruckus/default.nix diff --git a/pkgs/development/python-modules/pyruckus/default.nix b/pkgs/development/python-modules/pyruckus/default.nix deleted file mode 100644 index d2b896605f7f..000000000000 --- a/pkgs/development/python-modules/pyruckus/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pexpect -, python-slugify -, pythonOlder -}: - -buildPythonPackage rec { - pname = "pyruckus"; - version = "0.16"; - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "gabe565"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-SVE5BrCCQgCrhOC0CSGgbZ9TEY3iZ9Rp/xMUShPAxxM="; - }; - - propagatedBuildInputs = [ - pexpect - python-slugify - ]; - - # Tests requires network features - doCheck = false; - pythonImportsCheck = [ "pyruckus" ]; - - meta = with lib; { - description = "Python client for Ruckus Unleashed"; - homepage = "https://github.com/gabe565/pyruckus"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 74a20905a574..d79138fdf3ea 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -290,6 +290,7 @@ mapAliases ({ Pyro4 = pyro4; # added 2023-02-19 Pyro5 = pyro5; # added 2023-02-19 PyRSS2Gen = pyrss2gen; # added 2023-02-19 + pyruckus = throw "pyruckus has been removed, it was deprecrated in favor of aioruckus."; # added 2023-09-07 pysha3 = throw "pysha3 has been removed, use safe-pysha3 instead"; # added 2023-05-20 pysmart-smartx = pysmart; # added 2021-10-22 pysparse = throw "pysparse has been abandoned upstream."; # added 2023-02-28 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d014c1d19e5c..0de4fb63bb20 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9845,8 +9845,6 @@ self: super: with self; { pyrtlsdr = callPackage ../development/python-modules/pyrtlsdr { }; - pyruckus = callPackage ../development/python-modules/pyruckus { }; - pysaj = callPackage ../development/python-modules/pysaj { }; pysam = callPackage ../development/python-modules/pysam { }; From de5fa879ed6fe0869b38fe93d15a87fb12620652 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Sep 2023 01:23:06 +0200 Subject: [PATCH 094/134] python311Packages.homeassistant-stubs: 2023.8.4 -> 2023.9.0 https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.9.0 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index fa2bdee5f89f..b838dabe2dcb 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.8.4"; + version = "2023.9.0"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-Oxge6gZ7m0ZFuJKIy6X9YgmC7aK2/oQWJAYCFTclZ/Y="; + hash = "sha256-7G6IIOrQGRF7zLr+2WlZTvixyyoFqrLJiC/BNqUqx20="; }; nativeBuildInputs = [ From c85eef94d291b29a369d9054c45ea7ef703d902f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Sep 2023 08:42:33 +0200 Subject: [PATCH 095/134] python310Packages.bimmer-connected: provide test responses in the package output, as home-assistant tests rely on them. Also enable more tests by providing pytest-asyncio. --- .../python-modules/bimmer-connected/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index baa4ddacfec5..57eb2dc26845 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -7,9 +7,12 @@ , httpx , pycryptodome , pyjwt +, pytest-asyncio , pytestCheckHook +, python , respx , time-machine +, tzdata }: buildPythonPackage rec { @@ -39,12 +42,21 @@ buildPythonPackage rec { pyjwt ]; + postInstall = '' + cp -R bimmer_connected/tests/responses $out/${python.sitePackages}/bimmer_connected/tests/ + ''; + nativeCheckInputs = [ + pytest-asyncio pytestCheckHook respx time-machine ]; + preCheck = '' + export TZDIR=${tzdata}/${python.sitePackages}/tzdata/zoneinfo + ''; + pythonImportsCheck = [ "bimmer_connected" ]; From e7d3f6bc3644d889049bbab40c43a9bc6117248e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Sep 2023 10:27:43 +0200 Subject: [PATCH 096/134] home-assistant: pin plexapi at 4.13.2 --- pkgs/servers/home-assistant/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 76450b9d4ed9..ef81b0d65fc3 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -134,6 +134,16 @@ let }; }); + plexapi = super.plexapi.overridePythonAttrs (oldAttrs: rec { + version = "4.13.2"; + src = fetchFromGitHub { + owner = "pkkid"; + repo = "python-plexapi"; + rev = "refs/tags/${version}"; + hash = "sha256-5YwINPgQ4efZBvu5McsLYicW/7keKSi011lthJUR9zw="; + }; + }); + # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; From e40439b029cd0ac25aebac8e3d101b5a6a604d0e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Sep 2023 10:48:02 +0200 Subject: [PATCH 097/134] python311Packages.zeroconf: 0.99.0 -> 0.102.0 https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.102.0 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 73c697c46c3c..a0d3cd2517b0 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.99.0"; + version = "0.102.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-T9CDJIK/wMGExk+1Fahbq4gm+t+RRSUxca3SxkHXtJQ="; + hash = "sha256-Z4RswQDA05wXXyg8CeIiuh9I1EXTyXh6Z88r7soGFTo="; }; nativeBuildInputs = [ From b3da5e68a18f456ec57d9b1ea16713ba9d041d6c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Sep 2023 10:57:39 +0200 Subject: [PATCH 098/134] home-assistant: pin zeroconf at 0.91.1 --- pkgs/servers/home-assistant/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ef81b0d65fc3..26d28053947b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -282,6 +282,16 @@ let }; }); + zeroconf = super.zeroconf.overridePythonAttrs (oldAttrs: rec { + version = "0.91.1"; + src = fetchFromGitHub { + owner = "python-zeroconf"; + repo = "python-zeroconf"; + rev = "refs/tags/${version}"; + hash = "sha256-HHADcxXjfukRJtqRjfKI/spZIqOfDT0Etg4oYzNdXIs="; + }; + }); + # internal python packages only consumed by home-assistant itself home-assistant-frontend = self.callPackage ./frontend.nix { }; home-assistant-intents = self.callPackage ./intents.nix { }; From 01d9ff8cbf26b94430774c15c6f901bd4bfa29ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 09:12:57 +0000 Subject: [PATCH 099/134] julia-mono: 0.050 -> 0.051 --- pkgs/data/fonts/julia-mono/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index f1838b548147..fa44d5d6449d 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.050"; + version = "0.051"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-XySK+o0ROfmvII5Yvb/3HbLepRTaeVNEZwSVbhsZDsE="; + hash = "sha256-JdoCblRW9Vih7zQyvTb/VXhZJJDNV0sPDfTQ+wRKotE="; }; installPhase = '' From f538d909705432475dd3a81b965883426636cfee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 09:25:23 +0000 Subject: [PATCH 100/134] oh-my-posh: 18.3.5 -> 18.7.0 --- pkgs/development/tools/oh-my-posh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index eef381178ac5..1420280cb559 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "18.3.5"; + version = "18.7.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5wcKG97NXTTTBJOD9kOsOp1MuHazAPlE4yLPWJoeCA8="; + hash = "sha256-dnaKcyDy4TdlTPl0hCUCshW6aFMLUUFwVskv1jiO0fk="; }; - vendorHash = "sha256-xkguBWk2Nh8w7C7tKbvaP0tRgZO4z08AEsdjNlJYC6Q="; + vendorHash = "sha256-GHOWcZqZmjL+EptcuCwbj0WSWKmhbsxpZFvHhlmsbxU="; sourceRoot = "${src.name}/src"; From d1f1457e3f66a757526da0cb49e5f93ba2c5dfc3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 1 Sep 2023 06:50:28 +0200 Subject: [PATCH 101/134] =?UTF-8?q?ocamlPackages.tls:=200.16.0=20=E2=86=92?= =?UTF-8?q?=200.17.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit jackline: 2023-02-24 → 2023-03-09 --- .../instant-messengers/jackline/default.nix | 9 ++++---- .../ocaml-modules/conduit/mirage.nix | 8 ++++++- pkgs/development/ocaml-modules/tls/async.nix | 13 +++++------ .../development/ocaml-modules/tls/default.nix | 16 ++++--------- .../ocaml-modules/tls/janestreet-0.16.patch | 23 ------------------- pkgs/development/ocaml-modules/tls/lwt.nix | 1 - pkgs/development/ocaml-modules/tls/mirage.nix | 1 - 7 files changed, 22 insertions(+), 49 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/tls/janestreet-0.16.patch diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 9178c73a46dd..2c86b3e86fa8 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -4,17 +4,15 @@ with ocamlPackages; buildDunePackage rec { pname = "jackline"; - version = "unstable-2023-02-24"; + version = "unstable-2023-03-09"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; - src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "846be4e7fcddf45e66e0ff5b29fb5a212d6ee8c3"; - hash = "sha256-/j3VJRx/w9HQUnfoq/4gMWV5oVdRiPGddrgbCDk5y8c="; + rev = "a7acd19bd8141b842ac69b05146d9a63e729230d"; + hash = "sha256-AhiFfZkDit9tnGenETc3A1hHqWN+csiS2bVjsGNaHf8="; }; nativeBuildInpts = [ @@ -43,6 +41,7 @@ buildDunePackage rec { cstruct base64 happy-eyeballs-lwt + ppx_sexp_conv ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/conduit/mirage.nix b/pkgs/development/ocaml-modules/conduit/mirage.nix index 9123c235dd3a..04025666c3d9 100644 --- a/pkgs/development/ocaml-modules/conduit/mirage.nix +++ b/pkgs/development/ocaml-modules/conduit/mirage.nix @@ -1,4 +1,5 @@ { buildDunePackage, conduit-lwt +, fetchpatch , ppx_sexp_conv, sexplib, uri, cstruct, mirage-flow , mirage-flow-combinators, mirage-random, mirage-time, mirage-clock , dns-client-mirage, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp @@ -9,7 +10,12 @@ buildDunePackage { pname = "conduit-mirage"; inherit (conduit-lwt) version src; - duneVersion = "3"; + + # Compatibility with tls ≥ 0.17 + patches = fetchpatch { + url = "https://github.com/mirage/ocaml-conduit/commit/403b4cec528dae71aded311215868a35c11dad7e.patch"; + hash = "sha256-R/iuLf2PSrx8mLKLueMA3+zr9sB8dX/3evjUbfQECBk="; + }; nativeBuildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/tls/async.nix b/pkgs/development/ocaml-modules/tls/async.nix index 5e861592cd7b..d4bdb84d685d 100644 --- a/pkgs/development/ocaml-modules/tls/async.nix +++ b/pkgs/development/ocaml-modules/tls/async.nix @@ -3,14 +3,9 @@ buildDunePackage rec { pname = "tls-async"; - inherit (tls) src meta version; + inherit (tls) src version; - minimalOCamlVersion = "4.13"; - - patches = [ - # Remove when TLS gets updated to v0.17.1. - ./janestreet-0.16.patch - ]; + minimalOCamlVersion = "4.14"; doCheck = true; @@ -22,4 +17,8 @@ buildDunePackage rec { mirage-crypto-rng-async tls ]; + + meta = tls.meta // { + description = "Transport Layer Security purely in OCaml, Async layer"; + }; } diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 18506b611f2a..e89ac5aeeef5 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,40 +1,34 @@ { lib, fetchurl, buildDunePackage -, cstruct, cstruct-sexp, domain-name, fmt, ppx_cstruct, ppx_sexp_conv, logs, hkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, ocaml_lwt, ptime, sexplib, x509 -, ipaddr, ipaddr-sexp +, cstruct, domain-name, fmt, logs, hkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, lwt, ptime, x509 +, ipaddr , alcotest, cstruct-unix, ounit2, randomconv }: buildDunePackage rec { pname = "tls"; - version = "0.16.0"; + version = "0.17.1"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-${version}.tbz"; - sha256 = "sha256-uvIDZLNy6E/ce7YmzUUVaOeGRaHqPSUzuEPQDMu09tM="; + hash = "sha256-gBDStt4UjaIoaSgYHSM71yD6YPoVez1CULyg3QCMXT8="; }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; propagatedBuildInputs = [ cstruct - cstruct-sexp domain-name fmt - ppx_cstruct - ppx_sexp_conv logs hkdf mirage-crypto mirage-crypto-ec mirage-crypto-pk mirage-crypto-rng - ocaml_lwt + lwt ptime - sexplib x509 ipaddr - ipaddr-sexp ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch b/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch deleted file mode 100644 index 7d36ad227fa0..000000000000 --- a/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/async/tls_async.mli b/async/tls_async.mli -index b4894b8..101f27f 100644 ---- a/async/tls_async.mli -+++ b/async/tls_async.mli -@@ -55,4 +55,4 @@ val connect - -> 'addr Tcp.Where_to_connect.t - -> host:[ `host ] Domain_name.t option - -> (Session.t * Reader.t * Writer.t) Deferred.Or_error.t) -- Tcp.with_connect_options -+ Tcp.Aliases.with_connect_options -diff --git a/async/x509_async.ml b/async/x509_async.ml -index d4fad8c..4ee466a 100644 ---- a/async/x509_async.ml -+++ b/async/x509_async.ml -@@ -9,7 +9,7 @@ let file_contents file = - let load_all_in_directory ~directory ~f = - let open Deferred.Or_error.Let_syntax in - let%bind files = Deferred.Or_error.try_with (fun () -> Sys.ls_dir directory) in -- Deferred.Or_error.List.map files ~f:(fun file -> -+ Deferred.Or_error.List.map ~how:`Sequential files ~f:(fun file -> - let%bind contents = file_contents (directory ^/ file) in - f ~contents) - ;; diff --git a/pkgs/development/ocaml-modules/tls/lwt.nix b/pkgs/development/ocaml-modules/tls/lwt.nix index 90eefa4347e0..d7db822182d3 100644 --- a/pkgs/development/ocaml-modules/tls/lwt.nix +++ b/pkgs/development/ocaml-modules/tls/lwt.nix @@ -6,7 +6,6 @@ buildDunePackage rec { inherit (tls) src meta version; minimalOCamlVersion = "4.11"; - duneVersion = "3"; doCheck = true; diff --git a/pkgs/development/ocaml-modules/tls/mirage.nix b/pkgs/development/ocaml-modules/tls/mirage.nix index 667dd9b57c98..a8add9e6ea6b 100644 --- a/pkgs/development/ocaml-modules/tls/mirage.nix +++ b/pkgs/development/ocaml-modules/tls/mirage.nix @@ -5,7 +5,6 @@ buildDunePackage { pname = "tls-mirage"; inherit (tls) src version; - duneVersion = "3"; propagatedBuildInputs = [ fmt From dd57b3f25042f3fe7852d0e6a817da440aebfe98 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 8 Sep 2023 11:47:30 +0200 Subject: [PATCH 102/134] php: fix path to `genfiles` --- pkgs/development/interpreters/php/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index d60d0cdf1fd1..cee1e833f9a6 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -271,8 +271,8 @@ let ./buildconf --copy --force - if test -f $src/genfiles; then - ./genfiles + if [ -f "scripts/dev/genfiles" ]; then + ./scripts/dev/genfiles fi '' + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace "-lstdc++" "-lc++" From 350a1b3e022c3d05dba9e3ddf4050409a49ee474 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Sep 2023 12:28:10 +0200 Subject: [PATCH 103/134] home-assistant: propagate packaging An oversight in the last package update. --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 26d28053947b..60004331b366 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -413,6 +413,7 @@ in python.pkgs.buildPythonApplication rec { jinja2 lru-dict orjson + packaging pip pyopenssl pyjwt From b02edfa6f948e0b6f3c5bc6b4368a53bb0d0aacb Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 7 Sep 2023 05:04:21 -0400 Subject: [PATCH 104/134] python310Packages.unstructured-inference: 0.5.7 -> 0.5.22 --- .../python-modules/unstructured-inference/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix index 58b49828d1e0..eb34584736d3 100644 --- a/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/pkgs/development/python-modules/unstructured-inference/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "unstructured-inference"; - version = "0.5.7"; + version = "0.5.22"; format = "setuptools"; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-inference"; rev = "refs/tags/${version}"; - hash = "sha256-xlsihi1ZTNgdnSk3H8rMBRi4AAxPKNFqygcIMtM/jE0="; + hash = "sha256-YMPChP8/KB/UioavIa0pdj0wH9bTkN8frFmkQZ3bUPc="; }; postPatch = '' From 636f80091e5e861055a413c7e43a453bc7e466fe Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 7 Sep 2023 05:04:42 -0400 Subject: [PATCH 105/134] unstructured-api: 0.0.41 -> 0.0.42 --- pkgs/servers/unstructured-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unstructured-api/default.nix b/pkgs/servers/unstructured-api/default.nix index 08a2737ee769..117af0ec816d 100644 --- a/pkgs/servers/unstructured-api/default.nix +++ b/pkgs/servers/unstructured-api/default.nix @@ -21,7 +21,7 @@ let safetensors uvicorn ] ++ packages.unstructured.optional-dependencies.local-inference); - version = "0.0.41"; + version = "0.0.42"; unstructured_api_nltk_data = symlinkJoin { name = "unstructured_api_nltk_data"; @@ -35,7 +35,7 @@ in stdenvNoCC.mkDerivation { owner = "Unstructured-IO"; repo = "unstructured-api"; rev = version; - hash = "sha256-tkxULIycMB9Mg6K2C9H/r3vt6GOMeh53OO6Y+Jga0Rc="; + hash = "sha256-Tn4o7gAIlvWUTbAmbTCF9LgMk0up16iWuNPTy6pxOuk="; }; nativeBuildInputs = [ makeWrapper ]; From 95fd689f85add9a871fedcb896104330236b338f Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 8 Sep 2023 12:37:24 +0200 Subject: [PATCH 106/134] php: run `genfiles` for building extensions too --- pkgs/top-level/php-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index f60ae14cf585..2e810ca09927 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -31,6 +31,7 @@ , pam , pcre2 , postgresql +, bison , re2c , readline , rsync @@ -101,14 +102,22 @@ lib.makeScope pkgs.newScope (self: with self; { autoconf pkg-config re2c + bison ]; inherit configureFlags internalDeps buildInputs zendExtension doCheck; preConfigurePhases = [ + "genfiles" "cdToExtensionRootPhase" ]; + genfiles = '' + if [ -f "scripts/dev/genfiles" ]; then + ./scripts/dev/genfiles + fi + ''; + cdToExtensionRootPhase = '' # Go to extension source root. cd "ext/${extName}" From 127ddbae4a8bc78fdf712a2434d414e8f2150ac0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 03:55:04 +0000 Subject: [PATCH 107/134] atomic-swap: 0.4.1 -> 0.4.2 --- pkgs/applications/blockchains/atomic-swap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/atomic-swap/default.nix b/pkgs/applications/blockchains/atomic-swap/default.nix index 496a67fa546e..45909b6b4695 100644 --- a/pkgs/applications/blockchains/atomic-swap/default.nix +++ b/pkgs/applications/blockchains/atomic-swap/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub, nix-update-script, makeWrapper, monero-cli }: let pname = "atomic-swap"; - version = "0.4.1"; + version = "0.4.2"; in buildGoModule { inherit pname version; @@ -10,10 +10,10 @@ buildGoModule { owner = "AthanorLabs"; repo = "atomic-swap"; rev = "v${version}"; - hash = "sha256-CYqYRYLMfvPX8TqyFSRg4ookeIfYGc0HDzu/Ip9Ecsg="; + hash = "sha256-JnbKaGmpTDwQMSDR4Y8Q2JTtuQV5GGuovxeIYs0KgQI="; }; - vendorHash = "sha256-igHuklt76r7MDxz8TAaFgFdQS7L3DJkMYarAMNVYTC4="; + vendorHash = "sha256-acBnXGy1kVBwB+j8VqGyinabnI/boTtbFNyjE6EHVes="; subPackages = [ "cmd/swapcli" From 345a334e9e5f1b871101df8ff88628f5ba0c51d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 10:56:22 +0000 Subject: [PATCH 108/134] sd-local: 1.0.46 -> 1.0.48 --- pkgs/development/tools/sd-local/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix index b6e61b41f939..da696c5d714c 100644 --- a/pkgs/development/tools/sd-local/default.nix +++ b/pkgs/development/tools/sd-local/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.46"; + version = "1.0.48"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+Z12atz6fSM5FJFOqUhjalxkP/1Kkm3xWgwUVlB9JvM="; + sha256 = "sha256-cjPqVdHJt1/kxFCdjOKQIvq1V3KppHPeWozrawxdJek="; }; - vendorSha256 = "sha256-sgCUho8KFt0iFEuupQdMV6IZTVCsTXsNqv2ab5jp0mI="; + vendorHash = "sha256-uHu8jPPQCJAhXE+Lzw5/9wyw7sL5REQJsPsYII+Nusc="; subPackages = [ "." ]; From 5cedb097a0a07c36125e274404b67ed9c51d88b0 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 3 Apr 2023 01:47:31 +0300 Subject: [PATCH 109/134] androidenv.buildApp: fix after callPackage switch builtins.functionArgs doesn't work with (callPackage composeAndroidPackages { .. }) --- pkgs/development/mobile/androidenv/build-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 7e34c34607eb..18e59f0bd0d6 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -9,7 +9,7 @@ assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null; let - androidSdkFormalArgs = builtins.functionArgs composeAndroidPackages; + androidSdkFormalArgs = lib.functionArgs composeAndroidPackages; androidArgs = builtins.intersectAttrs androidSdkFormalArgs args; androidsdk = (composeAndroidPackages androidArgs).androidsdk; From db76ee42c288dcc534d9ab1b6865b6d0a585c33d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 8 Sep 2023 15:48:38 +0200 Subject: [PATCH 110/134] jack-example-tools: add darwin support --- pkgs/misc/jackaudio/tools.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/jackaudio/tools.nix b/pkgs/misc/jackaudio/tools.nix index 1e3a74e6f6ee..ac14d1528ce4 100644 --- a/pkgs/misc/jackaudio/tools.nix +++ b/pkgs/misc/jackaudio/tools.nix @@ -15,6 +15,8 @@ , readline , zita-alsa-pcmi , zita-resampler + +, enableAlsa ? stdenv.isLinux }: stdenv.mkDerivation (final: { @@ -28,21 +30,27 @@ stdenv.mkDerivation (final: { hash = "sha256-5jmynNxwNVLxEZ1MaqQUG6kRwipDkjhrdDCbZHtmAHk="; }; + postPatch = '' + patchShebangs scripts + ''; + nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ jack - alsa-lib libopus libsamplerate libsndfile readline + ] ++ lib.optionals enableAlsa [ + alsa-lib zita-alsa-pcmi zita-resampler ]; - postPatch = '' - patchShebangs scripts - ''; + mesonFlags = [ + (lib.mesonEnable "alsa_in_out" enableAlsa) + (lib.mesonEnable "zalsa" enableAlsa) + ]; # no tests defined, but prepare for some in the future. doCheck = true; @@ -52,7 +60,6 @@ stdenv.mkDerivation (final: { homepage = "https://jackaudio.org"; license = licenses.gpl2Plus; platforms = platforms.unix; - broken = stdenv.isDarwin; maintainers = with maintainers; [ pennae ]; }; }) From 37fd4294fdba6e118c85abbe4e1e56358b76cdce Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 8 Sep 2023 16:04:47 +0200 Subject: [PATCH 111/134] ldacbt: Mark as littleEndian-only ldacBT_internal.c #error's on non-LE byte order. --- pkgs/development/libraries/ldacbt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix index 1d91cafc81c4..de01c6a7a1ae 100644 --- a/pkgs/development/libraries/ldacbt/default.nix +++ b/pkgs/development/libraries/ldacbt/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { description = "AOSP libldac dispatcher"; homepage = "https://github.com/EHfive/ldacBT"; license = licenses.asl20; - platforms = platforms.all; + # libldac code detects & #error's out on non-LE byte order + platforms = platforms.littleEndian; maintainers = with maintainers; [ adisbladis ]; }; } From f4e90e518149e07c2749c1ab9450f837f53c68dc Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 8 Sep 2023 10:09:35 -0400 Subject: [PATCH 112/134] cargo-make: 0.36.13 -> 0.37.0 Diff: https://github.com/sagiegurari/cargo-make/compare/0.36.13...0.37.0 Changelog: https://github.com/sagiegurari/cargo-make/blob/0.37.0/CHANGELOG.md --- pkgs/development/tools/rust/cargo-make/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 2677eff21a10..ca56a30d814a 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -1,6 +1,6 @@ { lib , rustPlatform -, fetchCrate +, fetchFromGitHub , pkg-config , bzip2 , openssl @@ -10,14 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.36.13"; + version = "0.37.0"; - src = fetchCrate { - inherit pname version; - hash = "sha256-9EnVO2CJY5y01mxSWphbuTVnckgUr6L8GrFy1nQcqT8="; + src = fetchFromGitHub { + owner = "sagiegurari"; + repo = "cargo-make"; + rev = version; + hash = "sha256-gc/0mlhQdE9tnCpDQ2vSWX4WcqnPxRjmL6YPtYGEn5E="; }; - cargoHash = "sha256-K6D5e9inuB1y3VcEW73ikrkTcewnZyW7kdHSDkWxC3w="; + cargoHash = "sha256-ut9s+kMATtmOfyIp+TwmdQtlObiZexWbh1p1tcCpYGo="; nativeBuildInputs = [ pkg-config ]; From 619059929d669c6d1ccd156fe83e411c195e7852 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 8 Sep 2023 10:17:17 -0400 Subject: [PATCH 113/134] cargo-make: set meta.mainProgram --- pkgs/development/tools/rust/cargo-make/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index ca56a30d814a..dc58914a2784 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -42,5 +42,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/sagiegurari/cargo-make/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ figsoda xrelkd ]; + mainProgram = "cargo-make"; }; } From a68dc64ea14e01781c09d88a2333d642f2c960dd Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Fri, 8 Sep 2023 14:04:52 +0200 Subject: [PATCH 114/134] xpra: depend on libappindicator Without this, xpra client does not show tray icon in wayland-based desktops. --- pkgs/tools/X11/xpra/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index f43196644c7d..e77273c6084c 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -16,6 +16,7 @@ , gobject-introspection , gst_all_1 , gtk3 +, libappindicator , libfakeXinerama , librsvg , libvpx @@ -118,6 +119,7 @@ in buildPythonApplication rec { gdk-pixbuf glib gtk3 + libappindicator librsvg libvpx libwebp From 9f815be60520665e139fb8575a64218fc7994ecc Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 8 Sep 2023 14:47:37 +0200 Subject: [PATCH 115/134] perldevel: remove - Removes `perldevel` and `perldevelPackages` perldevel (and perldevelPackages) are supposed to track the latest development version of perl. This package is rarely updated, and usually cause issues updating stable versions of perl since perl-cross releases don't include patches for development versions --- pkgs/development/interpreters/perl/default.nix | 9 --------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 201a080309d7..502bd5522346 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -69,13 +69,4 @@ in rec { sha256 = "sha256-IT71gInS8sly6jU1F9xg7DZW8FDcwCdmbhGLUIQj5Rc="; inherit passthruFun; }; - - # the latest Devel version - perldevel = callPackage ./intepreter.nix { - self = perldevel; - perlAttr = "perldevel"; - version = "5.38.0"; - sha256 = "sha256-IT71gInS8sly6jU1F9xg7DZW8FDcwCdmbhGLUIQj5Rc="; - inherit passthruFun; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0bb7d49bab8..8c9cab754b8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26215,11 +26215,10 @@ with pkgs; ### DEVELOPMENT / PERL MODULES perlInterpreters = import ../development/interpreters/perl { inherit callPackage; }; - inherit (perlInterpreters) perl536 perl538 perldevel; + inherit (perlInterpreters) perl536 perl538; perl536Packages = recurseIntoAttrs perl536.pkgs; perl538Packages = recurseIntoAttrs perl538.pkgs; - perldevelPackages = perldevel.pkgs; perl = perl538; perlPackages = perl538Packages; From b90ab315c1407e6eb0dc53917c2d866d65e0eab2 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 8 Sep 2023 14:52:05 +0200 Subject: [PATCH 116/134] unit: remove `withPerldevel` option --- pkgs/servers/http/unit/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 3eecd652ada3..43d79838079a 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -5,7 +5,6 @@ , withPHP82 ? false, php82 , withPerl536 ? false, perl536 , withPerl538 ? true, perl538 -, withPerldevel ? false, perldevel , withRuby_3_0 ? false, ruby_3_0 , withRuby_3_1 ? true, ruby_3_1 , withRuby_3_2 ? false, ruby_3_2 @@ -48,7 +47,6 @@ in stdenv.mkDerivation rec { ++ optional withPHP82 php82-unit ++ optional withPerl536 perl536 ++ optional withPerl538 perl538 - ++ optional withPerldevel perldevel ++ optional withRuby_3_0 ruby_3_0 ++ optional withRuby_3_1 ruby_3_1 ++ optional withRuby_3_2 ruby_3_2 @@ -72,7 +70,6 @@ in stdenv.mkDerivation rec { ${optionalString withPHP82 "./configure php --module=php81 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"} ${optionalString withPerl536 "./configure perl --module=perl536 --perl=${perl536}/bin/perl"} ${optionalString withPerl538 "./configure perl --module=perl538 --perl=${perl538}/bin/perl"} - ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} ${optionalString withRuby_3_0 "./configure ruby --module=ruby30 --ruby=${ruby_3_0}/bin/ruby"} ${optionalString withRuby_3_1 "./configure ruby --module=ruby31 --ruby=${ruby_3_1}/bin/ruby"} ${optionalString withRuby_3_2 "./configure ruby --module=ruby32 --ruby=${ruby_3_2}/bin/ruby"} From fc4d0f61585c0ccdf7de2ef789d0095d0f0258fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Fri, 8 Sep 2023 09:16:36 +0300 Subject: [PATCH 117/134] rusti-cal: init at 1.1.0 --- pkgs/by-name/ru/rusti-cal/package.nix | 31 +++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/ru/rusti-cal/package.nix diff --git a/pkgs/by-name/ru/rusti-cal/package.nix b/pkgs/by-name/ru/rusti-cal/package.nix new file mode 100644 index 000000000000..3dd368e19257 --- /dev/null +++ b/pkgs/by-name/ru/rusti-cal/package.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "rusti-cal"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "arthurhenrique"; + repo = "rusti-cal"; + rev = "v${version}"; + hash = "sha256-pdsP2nuJh30BzqIyxSQXak/rceA4hI9jBYy1dDVEIvI="; + }; + + cargoHash = "sha256-5eS+OMaNAVNyDMKFNfb0J0rLsikw2LCXhWk7MS9UV2k="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + ]; + + meta = with lib; { + description = "Minimal command line calendar, similar to cal"; + homepage = "https://github.com/arthurhenrique/rusti-cal"; + license = [ licenses.mit ]; + maintainers = [ maintainers.detegr ]; + }; +} From a4f6862fb17a1a325090a309b362cddba7292a61 Mon Sep 17 00:00:00 2001 From: marble Date: Fri, 8 Sep 2023 13:53:37 +0200 Subject: [PATCH 118/134] klipper: fix cross compilation --- pkgs/servers/klipper/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 03b3504c68e8..a9703045cd70 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -38,6 +38,10 @@ stdenv.mkDerivation rec { substituteInPlace $file \ --replace '/usr/bin/env python2' '/usr/bin/env python' done + + # needed for cross compilation + substituteInPlace ./chelper/__init__.py \ + --replace 'GCC_CMD = "gcc"' 'GCC_CMD = "${stdenv.cc.targetPrefix}cc"' ''; # NB: We don't move the main entry point into `/bin`, or even symlink it, From 8fd861d13a28a5594f5c576b177054d8c6ea4182 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 8 Sep 2023 16:38:56 +0200 Subject: [PATCH 119/134] famistudio: 4.1.2 -> 4.1.3 --- pkgs/applications/audio/famistudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index 214996668c3d..e243498f129b 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/applications/audio/famistudio/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "famistudio"; - version = "4.1.2"; + version = "4.1.3"; src = fetchzip { url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip"; stripRoot = false; - hash = "sha256-zETivzQBkKOhsZryiwv3dDeXPO8CKWFfjERdPJXbj5U="; + hash = "sha256-eAdv0oObczbs8QLGYbxCrdFk/gN5DOCJ1dp/tg8JWIc="; }; strictDeps = true; From f64409b5ed66aad87cbf565fd4b20573d9355c74 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Sat, 12 Aug 2023 16:56:31 +0800 Subject: [PATCH 120/134] ifrextractor-rs: init at 1.5.1 https://github.com/LongSoft/IFRExtractor-RS/releases/tag/v1.5.1 --- pkgs/by-name/if/ifrextractor-rs/Cargo.lock | 32 +++++++++++++++++++++ pkgs/by-name/if/ifrextractor-rs/package.nix | 31 ++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 pkgs/by-name/if/ifrextractor-rs/Cargo.lock create mode 100644 pkgs/by-name/if/ifrextractor-rs/package.nix diff --git a/pkgs/by-name/if/ifrextractor-rs/Cargo.lock b/pkgs/by-name/if/ifrextractor-rs/Cargo.lock new file mode 100644 index 000000000000..5818fd6e1fa3 --- /dev/null +++ b/pkgs/by-name/if/ifrextractor-rs/Cargo.lock @@ -0,0 +1,32 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ifrextractor" +version = "1.5.1" +dependencies = [ + "nom", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "nom" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" +dependencies = [ + "memchr", + "version_check", +] + +[[package]] +name = "version_check" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" diff --git a/pkgs/by-name/if/ifrextractor-rs/package.nix b/pkgs/by-name/if/ifrextractor-rs/package.nix new file mode 100644 index 000000000000..48ab01d352fa --- /dev/null +++ b/pkgs/by-name/if/ifrextractor-rs/package.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "ifrextractor-rs"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "LongSoft"; + repo = pname; + rev = "v${version}"; + hash = "sha256-zpoOThjkL2Hu/ytxdqWcr2GXzN4Cm8hph7PJhSF5BlU="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + meta = with lib; { + description = "Rust utility to extract UEFI IFR data into human-readable text"; + homepage = "https://github.com/LongSoft/IFRExtractor-RS"; + license = licenses.bsd2; + maintainers = with maintainers; [ jiegec ]; + }; +} From 0bcdfa925399c4dfc052ef9b0b03d92d7481831c Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Fri, 8 Sep 2023 13:14:54 +0200 Subject: [PATCH 121/134] mobilizon: 3.1.3 -> 3.2.0 Also removed some outdated mix overrides --- pkgs/servers/mobilizon/common.nix | 26 ++-- pkgs/servers/mobilizon/default.nix | 30 +--- pkgs/servers/mobilizon/frontend.nix | 2 +- pkgs/servers/mobilizon/mix.nix | 208 ++++++++++++++++------------ pkgs/servers/mobilizon/package.json | 26 ++-- 5 files changed, 154 insertions(+), 138 deletions(-) diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix index 427e009e7cca..35551a628c7f 100644 --- a/pkgs/servers/mobilizon/common.nix +++ b/pkgs/servers/mobilizon/common.nix @@ -1,14 +1,24 @@ -{ fetchFromGitLab }: rec { +{ fetchFromGitLab, applyPatches, fetchpatch }: rec { pname = "mobilizon"; - version = "3.1.3"; + version = "3.2.0"; - src = fetchFromGitLab { - domain = "framagit.org"; - owner = "framasoft"; - repo = pname; - rev = version; - sha256 = "sha256-vYn8wE3cwOH3VssPDKKWAV9ZLKMSGg6XVWFZzJ9HSw0="; + src = applyPatches { + src = fetchFromGitLab { + domain = "framagit.org"; + owner = "framasoft"; + repo = pname; + rev = version; + sha256 = "sha256-zgHR0taMMMwAoJEJr5s1rmSwJh31+qAfPQW9DSDuC8A="; + }; + patches = [ + # See https://framagit.org/framasoft/mobilizon/-/merge_requests/1452 + (fetchpatch { + url = "https://framagit.org/framasoft/mobilizon/-/commit/856d236b141c96705e1211e780e3f0e8950bb48e.patch"; + sha256 = "sha256-uEPvoTPVWHdg/KPWMG/Ck2qUjC+EUO3hyZnzpFxuoL0="; + }) + ]; }; + } diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix index 83b498347d18..eff6a0230e9b 100644 --- a/pkgs/servers/mobilizon/default.nix +++ b/pkgs/servers/mobilizon/default.nix @@ -42,30 +42,20 @@ mixRelease rec { fast_html = prev.fast_html.override { nativeBuildInputs = [ cmake ]; }; - ex_cldr = prev.ex_cldr.overrideAttrs (old: { - preBuild = "touch config/prod.exs"; + ex_cldr = prev.ex_cldr.overrideAttrs (old: rec { + version = "2.37.2"; # We have to use the GitHub sources, as it otherwise tries to download # the locales at build time. src = fetchFromGitHub { - owner = "erictapen"; + owner = "elixir-cldr"; repo = "cldr"; - # tip of 2.37.1/compile_env-fix - rev = "3a0dcf91132542a739f7b2450c6df12d40edeb0a"; - sha256 = "sha256-QQRt1HOuajCANbKxikdgN3oK9BdZJjg1qg+WHm4DuqY="; + rev = "v${version}"; + sha256 = "sha256-dDOQzLIi3zjb9xPyR7Baul96i9Mb3CFHUA+AWSexrk4="; }; postInstall = '' cp $src/priv/cldr/locales/* $out/lib/erlang/lib/ex_cldr-${old.version}/priv/cldr/locales/ ''; }); - ex_cldr_currencies = prev.ex_cldr_currencies.override { - preBuild = "touch config/prod.exs"; - }; - ex_cldr_numbers = prev.ex_cldr_numbers.override { - preBuild = "touch config/prod.exs"; - }; - ex_cldr_dates_times = prev.ex_cldr_dates_times.override { - preBuild = "touch config/prod.exs"; - }; # Upstream issue: https://github.com/bryanjos/geo_postgis/pull/87 geo_postgis = prev.geo_postgis.overrideAttrs (old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ final.ecto ]; @@ -94,16 +84,6 @@ mixRelease rec { }; beamDeps = with final; [ mix_test_watch ex_doc timex ]; }; - erlport = buildRebar3 rec { - name = "erlport"; - version = "0.10.1-compat"; - src = fetchFromGitHub { - owner = "tcitworld"; - repo = name; - rev = "1f8f4b1a50ecdf7e959090fb566ac45c63c39b0b"; - sha256 = "sha256-NkoGAW+1MTL0p7uUHl89GcQsbcfyAg/sMr417jUWMNM="; - }; - }; exkismet = buildMix rec { name = "exkismet"; version = "0.0.1"; diff --git a/pkgs/servers/mobilizon/frontend.nix b/pkgs/servers/mobilizon/frontend.nix index adfdbf395056..220138c33406 100644 --- a/pkgs/servers/mobilizon/frontend.nix +++ b/pkgs/servers/mobilizon/frontend.nix @@ -8,7 +8,7 @@ mkYarnPackage rec { offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - sha256 = "sha256-yvId4NG1RABQd27RbSYki6AOFWWr5C97QPWEcnK77OE="; + sha256 = "sha256-VkJ6vBt9EFoQVMWMV8FhPJBHcLJDDfOxd+NLb+DZy3U="; }; packageJSON = ./package.json; diff --git a/pkgs/servers/mobilizon/mix.nix b/pkgs/servers/mobilizon/mix.nix index 02515e056ed0..5c2f5b3353ba 100644 --- a/pkgs/servers/mobilizon/mix.nix +++ b/pkgs/servers/mobilizon/mix.nix @@ -10,12 +10,12 @@ let packages = with beamPackages; with self; { absinthe = buildMix rec { name = "absinthe"; - version = "1.7.1"; + version = "1.7.5"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0mralw4b8lwczv0m064h59y8fjqh9cihhmi5mpxkpyl173cxpi60"; + sha256 = "05n33srckncg3f50nxzx3r05n8axiwb2c4p91snr8qm2vj5a7a92"; }; beamDeps = [ dataloader decimal nimble_parsec telemetry ]; @@ -49,12 +49,12 @@ let argon2_elixir = buildMix rec { name = "argon2_elixir"; - version = "3.1.0"; + version = "3.2.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0wyxj4197jnz4z38611f00ym5n3w7hv06l4l3dfid4h2xvhfm3y0"; + sha256 = "142n65kcfsci052d0f7rzqzz0gg4xq7hgj7lzjsk0i9r2y1bf4x8"; }; beamDeps = [ comeonin elixir_make ]; @@ -114,12 +114,12 @@ let certifi = buildRebar3 rec { name = "certifi"; - version = "2.9.0"; + version = "2.12.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0ha6vmf5p3xlbf5w1msa89frhvfk535rnyfybz9wdmh6vdms8v96"; + sha256 = "077z80ijg0nfyslgdfl72c2wcfl76c7i1gmlrm040m9fy9fxhs7f"; }; beamDeps = []; @@ -166,12 +166,12 @@ let comeonin = buildMix rec { name = "comeonin"; - version = "5.3.3"; + version = "5.4.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1pw4rhhsh8mwj26dkbxz2niih9j8pc3qijlpcl8jh208rg1cjf1y"; + sha256 = "1wgsa5p4lfs9v8chky6as0w7a6j8n0545f5pasfrj08dwnlr6qvr"; }; beamDeps = []; @@ -270,12 +270,12 @@ let dataloader = buildMix rec { name = "dataloader"; - version = "1.0.10"; + version = "2.0.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0gwnrlrvylar2mdlgi9y9pylk8c3la3c2k71mjrg9pcsq3771kal"; + sha256 = "1w7ygm885fidf8i5q89ya1mg800dy0zqig6djpiidqkcny0igmh9"; }; beamDeps = [ ecto telemetry ]; @@ -309,12 +309,12 @@ let dialyxir = buildMix rec { name = "dialyxir"; - version = "1.3.0"; + version = "1.4.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0vv90jip2w362n3l7dkhqfdwlz97nwji535kn3fbk3dassya9ch0"; + sha256 = "00cqwhd1wabwds44jz94rvvr8z8cp12884d3lp69fqkrszb9bdw4"; }; beamDeps = [ erlex ]; @@ -322,12 +322,12 @@ let digital_token = buildMix rec { name = "digital_token"; - version = "0.4.0"; + version = "0.6.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "09kfwvjmjzikhy7p7s5dgkl9x011xvsb052fqfrmpvhz3pvfsy51"; + sha256 = "1lf4vp5bdjz4hmm6zb0knqz8qm4jn3fwma540a5i46n6wwkdcm94"; }; beamDeps = [ cldr_utils jason ]; @@ -348,12 +348,12 @@ let earmark_parser = buildMix rec { name = "earmark_parser"; - version = "1.4.32"; + version = "1.4.33"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0md7rhw1ix4fp31bql9scvl4jpijixczm2ky7mxffwq3srvxvc5q"; + sha256 = "13qvlqnii8g6bcz6cl330vjwaan7jy30g1app3yvjncvf8rnhlid"; }; beamDeps = []; @@ -374,12 +374,12 @@ let ecto = buildMix rec { name = "ecto"; - version = "3.10.2"; + version = "3.10.3"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0d82qqlvhpi1mkqifayzzd0r0068l5csz1ml6i5qlr6py1w5g2ba"; + sha256 = "0crlrpl392pbkzl6ar4z6afna8h9d46wshky1zbr3m344d7cggj4"; }; beamDeps = [ decimal jason telemetry ]; @@ -387,15 +387,15 @@ let ecto_autoslug_field = buildMix rec { name = "ecto_autoslug_field"; - version = "3.0.0"; + version = "3.1.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "03ycq3c6sm79sx5cxsbv3yc1zvx0ss2a8mig0qr33wc5rz3m5hlf"; + sha256 = "1zyr5zlsi8zwc4q8gkhw324h43a46k4k558nbi5y4qsjh0addpdn"; }; - beamDeps = [ ecto slugger ]; + beamDeps = [ ecto slugify ]; }; ecto_dev_logger = buildMix rec { @@ -426,12 +426,12 @@ let ecto_shortuuid = buildMix rec { name = "ecto_shortuuid"; - version = "0.1.3"; + version = "0.2.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "152299sdkpmg3wlcyf9lyfp2r515c5lvqnnmjkg6alhjsz7ch5fj"; + sha256 = "0rgvivrvl504jgfh2yqgcd74ar3q1qbxxwzngrd2zsbbx1qknbmr"; }; beamDeps = [ ecto shortuuid ]; @@ -439,12 +439,12 @@ let ecto_sql = buildMix rec { name = "ecto_sql"; - version = "3.10.1"; + version = "3.10.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0sy5277akp828hvcg60yxhpfgj543y2z1bqy2z414pv9ppdmp8pn"; + sha256 = "01whmapzs08xzachra73lhb0d8f7mvysz29qbqivjz55pkg1ih38"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -489,6 +489,19 @@ let beamDeps = []; }; + erlport = buildRebar3 rec { + name = "erlport"; + version = "0.11.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1r7f0j12gnx65p6c86w035rjlzp1sa52ghyip0lx6j1rmz63dccf"; + }; + + beamDeps = []; + }; + eternal = buildMix rec { name = "eternal"; version = "1.2.2"; @@ -504,12 +517,12 @@ let ex_cldr = buildMix rec { name = "ex_cldr"; - version = "2.37.1"; + version = "2.37.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0y5z2dkldf0a5zkdq9z9sxqbbnzp66azb92f81p9dg2lhhlc6q2x"; + sha256 = "1fljryh921whv90v6m1aax2rabybark3nw11cv76lwc0a0fpnin8"; }; beamDeps = [ cldr_utils decimal gettext jason nimble_parsec ]; @@ -517,12 +530,12 @@ let ex_cldr_calendars = buildMix rec { name = "ex_cldr_calendars"; - version = "1.22.0"; + version = "1.22.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "12wf4v9r27skhc7gzhh78f22mraisg8gw47bhrbwx780hvh6vj61"; + sha256 = "0s812jkj4hf5274gp568syk3xp2d9228wwkn7gwjx2rix3cqqh77"; }; beamDeps = [ ex_cldr_numbers ex_doc jason ]; @@ -543,15 +556,15 @@ let ex_cldr_dates_times = buildMix rec { name = "ex_cldr_dates_times"; - version = "2.13.3"; + version = "2.14.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1b212qxx41h86x9hxzjlr7mb4j2zz54bs6jw5sxii4dxi5hj3cpm"; + sha256 = "155z81x9z0wwd4l32rbq2pc64rp6kmdz35vsvz1fqskgah08nnpq"; }; - beamDeps = [ ex_cldr ex_cldr_calendars ex_cldr_numbers jason ]; + beamDeps = [ ex_cldr_calendars ex_cldr_numbers jason ]; }; ex_cldr_languages = buildMix rec { @@ -569,12 +582,12 @@ let ex_cldr_numbers = buildMix rec { name = "ex_cldr_numbers"; - version = "2.31.1"; + version = "2.32.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1kxb3w0yl9c0m6kb16k969r6g0x4xp536zwp6jffdw30pzs40k59"; + sha256 = "0jjh9a5w5ybvzpxpvia3kgig50h259yjgfbbhnsmcnv0p0k3ri08"; }; beamDeps = [ decimal digital_token ex_cldr ex_cldr_currencies jason ]; @@ -595,12 +608,12 @@ let ex_doc = buildMix rec { name = "ex_doc"; - version = "0.29.4"; + version = "0.30.6"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1xf49d0ni08a83iankdj8fb6jyxm67wjl0gdwihwnimf6ykrjric"; + sha256 = "17qhflrr5mrbavcw7pg6xabib270k2a3sagr4z3q5r7lmkfz4j5x"; }; beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; @@ -660,15 +673,15 @@ let excoveralls = buildMix rec { name = "excoveralls"; - version = "0.16.1"; + version = "0.17.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0f7i5gx1rpswbqmmqv133v3lpjwpkhjb2k56fmqcy210ir367rys"; + sha256 = "1q2sk1kha63hyp03wf3m9r30aqikh241jjns2h7wd11yjpd6zg4m"; }; - beamDeps = [ hackney jason ]; + beamDeps = [ castore jason ]; }; exgravatar = buildMix rec { @@ -712,12 +725,12 @@ let fast_html = buildMix rec { name = "fast_html"; - version = "2.0.5"; + version = "2.2.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "01k51qri44535b1hwixlxk7151vph6vapswlfq918g245544ypv0"; + sha256 = "1bpvmqw4pcx8ssgmazvqn0dm6b3g0m5rij6shy8qy5m6nhilyk06"; }; beamDeps = [ elixir_make nimble_pool ]; @@ -803,12 +816,12 @@ let geo_postgis = buildMix rec { name = "geo_postgis"; - version = "3.4.2"; + version = "3.4.3"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1m5abb98a0kl24ysmawznqz2m5vylm17q88rvd35b003gzwwkn28"; + sha256 = "1p7pdwrfbg244n50lhv27xbkmvgfi47y71nwbggzj5v469j36zc2"; }; beamDeps = [ geo jason postgrex ]; @@ -907,12 +920,12 @@ let hackney = buildRebar3 rec { name = "hackney"; - version = "1.18.1"; + version = "1.18.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "13hja14kig5jnzcizpdghj68i88f0yd9wjdfjic9nzi98kzxmv54"; + sha256 = "1zb59ghnlmlqcxkcr9caj7sbdv16ah7a394hf0jxnmvqz74xb55g"; }; beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ]; @@ -1024,12 +1037,12 @@ let jason = buildMix rec { name = "jason"; - version = "1.4.0"; + version = "1.4.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0891p2yrg3ri04p302cxfww3fi16pvvw1kh4r91zg85jhl87k8vr"; + sha256 = "18d70i31bz11nr6vgsjn5prvhkvwqbyf3xq22ck5cnsnzp6ixc7v"; }; beamDeps = [ decimal ]; @@ -1037,12 +1050,12 @@ let jose = buildMix rec { name = "jose"; - version = "1.11.5"; + version = "1.11.6"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "115k981kfg9jmafgs16rybc5qah6p0zgvni3bdyfl0pyp8av5lyw"; + sha256 = "0f4pzx8xdzjkkfjkl442w6lhajgfzsnp3dxcxrh1x72ga1swnxb2"; }; beamDeps = []; @@ -1050,12 +1063,12 @@ let jumper = buildMix rec { name = "jumper"; - version = "1.0.1"; + version = "1.0.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0cvlbfkapkvbwaijmjq3cxg5m6yv4rh69wvss9kfj862i83mk31i"; + sha256 = "1qb5y4i88d7nxar69an171m9fqpb6rpy4w42q2rimq11j1084xwv"; }; beamDeps = []; @@ -1193,12 +1206,12 @@ let mix_test_watch = buildMix rec { name = "mix_test_watch"; - version = "1.1.0"; + version = "1.1.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1hrfh7hg3iwmvzwwyshdddgjxwc2ci898lyak7c0zdybfv2b3djj"; + sha256 = "1bmswsjcngjj4rsp67wzhi4p69n32lp8j8qp09kk8lzf9nsn48pq"; }; beamDeps = [ file_system ]; @@ -1323,12 +1336,12 @@ let oban = buildMix rec { name = "oban"; - version = "2.15.1"; + version = "2.15.4"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1qgk5b5wsdavy0mwi1zklcl1sajxz693n0ayvn7lm1nvk1j63gk0"; + sha256 = "1707222miq6di3605cqyfcgdy6i0wlb3326z928kxcgzvwgn3kjz"; }; beamDeps = [ ecto_sql jason postgrex telemetry ]; @@ -1349,12 +1362,12 @@ let parse_trans = buildRebar3 rec { name = "parse_trans"; - version = "3.3.1"; + version = "3.4.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "12w8ai6b5s6b4hnvkav7hwxd846zdd74r32f84nkcmjzi1vrbk87"; + sha256 = "16p4c2xjrvz16kzpr9pmcvi6nxq6rwckqi9fp0ksibaxwxn402k2"; }; beamDeps = []; @@ -1362,12 +1375,12 @@ let phoenix = buildMix rec { name = "phoenix"; - version = "1.7.6"; + version = "1.7.7"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "127v5lrb0zflgm5cqwxsfjv76mizdldkzs66rdhb0as0h1vvxd7n"; + sha256 = "119h8lcvarlm7xrlrb301wgrd3plwwmbvl3f3dckfpjy75ff2rl9"; }; beamDeps = [ castore jason phoenix_pubsub phoenix_template phoenix_view plug plug_cowboy plug_crypto telemetry websock_adapter ]; @@ -1388,12 +1401,12 @@ let phoenix_html = buildMix rec { name = "phoenix_html"; - version = "3.3.1"; + version = "3.3.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1lyhagjpg4lran6431csgkvf28g50mdvh4mlsxgs21j9vmp91ldy"; + sha256 = "07d1x5nyk9qahqhyc7785774cyfwm07nnjr8kpxj073wcs7azba4"; }; beamDeps = [ plug ]; @@ -1414,12 +1427,12 @@ let phoenix_live_view = buildMix rec { name = "phoenix_live_view"; - version = "0.19.2"; + version = "0.19.5"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "157m7n71wfgd5c4gj9n120gxz5m6qrx3y7iriy5jxwwpyaqprici"; + sha256 = "1lx9gi70a3cabjnjhslqbs8ysnpjz5yj324vjkxxg6zv7kfs1smj"; }; beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view telemetry ]; @@ -1453,12 +1466,12 @@ let phoenix_template = buildMix rec { name = "phoenix_template"; - version = "1.0.1"; + version = "1.0.3"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1vlkd4z2bxinczwcysydidpnh49rpxjihb5k3k4k8qr2yrwc0z8m"; + sha256 = "0b4fbp9dhfii6njksm35z8xf4bp8lw5hr7bv0p6g6lj1i9cbdx0n"; }; beamDeps = [ phoenix_html ]; @@ -1531,12 +1544,12 @@ let postgrex = buildMix rec { name = "postgrex"; - version = "0.17.1"; + version = "0.17.3"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0md5j9k1vkwwzql68in6hmj0vfcdbnav33shxszf4fz7i2s5gc0l"; + sha256 = "1389zgxvv90nzz0nwb7l5l4gyg2hldmyg2s4h5xcmzd46mlz8v4l"; }; beamDeps = [ db_connection decimal jason ]; @@ -1544,12 +1557,12 @@ let progress_bar = buildMix rec { name = "progress_bar"; - version = "2.0.1"; + version = "3.0.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "11wgy5qxr7yn3f299v2rlab6vjyqas13fag7jjha6jgil9cfn695"; + sha256 = "1dzj622nf3drhswlvqia3b19j4wfclindi1d3b4yqjmjbarc50b9"; }; beamDeps = [ decimal ]; @@ -1596,12 +1609,12 @@ let sentry = buildMix rec { name = "sentry"; - version = "8.0.6"; + version = "8.1.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "10qqkqvykw8v3xdw9j19jgg3kwjfdrp9sz3wg0vk2bqnf822s6h5"; + sha256 = "1d0sd34ckmnkx60zfqvwb7gf37cbjk166nay1x8qbs31xx0pdz7r"; }; beamDeps = [ hackney jason plug plug_cowboy ]; @@ -1609,12 +1622,12 @@ let shortuuid = buildMix rec { name = "shortuuid"; - version = "2.1.2"; + version = "3.0.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0lyk7bv89v3wfymg9jhml12rygi15s3wwpi7nscm3sh0fprw9c6r"; + sha256 = "0f8dkll158j48jlynjkdrjc6vw72sv04lgxq5ii93fsca47zin6z"; }; beamDeps = []; @@ -1659,14 +1672,27 @@ let beamDeps = []; }; - sobelow = buildMix rec { - name = "sobelow"; - version = "0.12.2"; + slugify = buildMix rec { + name = "slugify"; + version = "1.3.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0p8wy0njiqmam9nsfjg0mgkmiwd4im6bhqjn2i8vc7amrryn22rg"; + sha256 = "0xmyv324a5prnzj20y1j1nkn18rki7cq3ri567d15csnn2z0n2fb"; + }; + + beamDeps = []; + }; + + sobelow = buildMix rec { + name = "sobelow"; + version = "0.13.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "03aawfxpxb567dxhka8737fxjy50hmggj56s55smvhszp0k90vnd"; }; beamDeps = [ jason ]; @@ -1674,12 +1700,12 @@ let ssl_verify_fun = buildRebar3 rec { name = "ssl_verify_fun"; - version = "1.1.6"; + version = "1.1.7"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x"; + sha256 = "1y37pj5q6gk1vrnwg1vraws9yihrv9g4133w2qq1sh1piw71jk7y"; }; beamDeps = []; @@ -1700,12 +1726,12 @@ let sweet_xml = buildMix rec { name = "sweet_xml"; - version = "0.7.3"; + version = "0.7.4"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1fpmwhqgvakvdpbwmmyh31ays3hzhnm9766xqyzp9zmkl5kwh471"; + sha256 = "0rx1xgdy4y9j8isnd2gnf2hz3vc7zrafy7cm6j194326pyyv1i77"; }; beamDeps = []; @@ -1713,12 +1739,12 @@ let swoosh = buildMix rec { name = "swoosh"; - version = "1.11.1"; + version = "1.11.5"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0gyj99pg798frxn6nzw34nd661vlwl0pdbfzxd8x5sj2bl5mqfhp"; + sha256 = "0h00h0ml8s6ca72ihq1bn4dj4aqldpapc7p1pg9mcbwdsvf5gvi1"; }; beamDeps = [ cowboy gen_smtp hackney jason mime plug_cowboy telemetry ]; @@ -1869,12 +1895,12 @@ let ueberauth_google = buildMix rec { name = "ueberauth_google"; - version = "0.10.2"; + version = "0.10.3"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "04js5qrydc7f3szphcwcccfsrrhyqqii5rhc4j8diqmmkms8gygw"; + sha256 = "0f005491i5jbhx76p7xshcpjcgjf0afqd4c6fgh3djdcaabclqi4"; }; beamDeps = [ oauth2 ueberauth ]; @@ -1934,12 +1960,12 @@ let unsafe = buildMix rec { name = "unsafe"; - version = "1.0.1"; + version = "1.0.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1rahpgz1lsd66r7ycns1ryz2qymamz1anrlps986900lsai2jxvc"; + sha256 = "0xgn5mfbi4c7yv33k11mhyxz7ijjy5wlmjs4rnlh3ay3hcb271dl"; }; beamDeps = []; @@ -1960,12 +1986,12 @@ let websock = buildMix rec { name = "websock"; - version = "0.5.2"; + version = "0.5.3"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "01gzcvz86x4hxk5d50qz38nkmi1fakyn5yw0m7gi6s6a5zi5spwj"; + sha256 = "0lxlp1h18595nqczfg15iy34kw5xbbab3yk6ml9cf8mcgwyla1b1"; }; beamDeps = []; @@ -1973,12 +1999,12 @@ let websock_adapter = buildMix rec { name = "websock_adapter"; - version = "0.5.3"; + version = "0.5.4"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0g8djd6l1yq8s84y4r3938dczvjs6jgxjbdm0ah6wszqq4abirfb"; + sha256 = "1azlnjpndkhz4h78fcz9p4ssf1shpfh2rqnszhiy5jsjkk3kihnj"; }; beamDeps = [ plug plug_cowboy websock ]; diff --git a/pkgs/servers/mobilizon/package.json b/pkgs/servers/mobilizon/package.json index f9366270eee2..662bcfa0daf2 100644 --- a/pkgs/servers/mobilizon/package.json +++ b/pkgs/servers/mobilizon/package.json @@ -1,6 +1,6 @@ { "name": "mobilizon", - "version": "3.1.3", + "version": "3.2.0", "private": true, "scripts": { "dev": "vite", @@ -57,7 +57,7 @@ "@vue-a11y/announcer": "^2.1.0", "@vue-a11y/skip-to": "^2.1.2", "@vue-leaflet/vue-leaflet": "^0.10.1", - "@vue/apollo-composable": "^4.0.0-beta.5", + "@vue/apollo-composable": "^4.0.0-beta.9", "@vue/compiler-sfc": "^3.2.37", "@vueuse/core": "^10.0.2", "@vueuse/head": "^1.0", @@ -67,7 +67,7 @@ "blurhash": "^2.0.0", "date-fns": "^2.16.0", "date-fns-tz": "^2.0.0", - "floating-vue": "^2.0.0-beta.17", + "floating-vue": "^2.0.0-beta.24", "graphql": "^15.8.0", "graphql-tag": "^2.10.3", "hammerjs": "^2.0.8", @@ -97,7 +97,7 @@ "zhyswan-vuedraggable": "^4.1.3" }, "devDependencies": { - "@histoire/plugin-vue": "^0.16.1", + "@histoire/plugin-vue": "^0.17.1", "@playwright/test": "^1.25.1", "@rushstack/eslint-patch": "^1.1.4", "@tailwindcss/forms": "^0.5.2", @@ -111,30 +111,30 @@ "@types/phoenix": "^1.5.2", "@types/sanitize-html": "^2.5.0", "@vitejs/plugin-vue": "^4.0.0", - "@vitest/coverage-c8": "^0.32.2", - "@vitest/ui": "^0.32.2", - "@vue/eslint-config-prettier": "^7.0.0", + "@vitest/coverage-v8": "^0.34.1", + "@vitest/ui": "^0.34.1", + "@vue/eslint-config-prettier": "^8.0.0", "@vue/eslint-config-typescript": "^11.0.0", "@vue/test-utils": "^2.0.2", "eslint": "^8.21.0", - "eslint-config-prettier": "^8.3.0", + "eslint-config-prettier": "^9.0.0", "eslint-plugin-import": "^2.20.2", - "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-prettier": "^5.0.0", "eslint-plugin-vue": "^9.3.0", "flush-promises": "^1.0.2", - "histoire": "^0.16.1", + "histoire": "^0.17.0", "husky": "^8.0.3", "jsdom": "^22.0.0", - "lint-staged": "^13.2.2", + "lint-staged": "^14.0.1", "mock-apollo-client": "^1.1.0", - "prettier": "^2.2.1", + "prettier": "^3.0.0", "prettier-eslint": "^15.0.1", "rollup-plugin-visualizer": "^5.7.1", "sass": "^1.34.1", "typescript": "~5.1.3", "vite": "^4.0.4", "vite-plugin-pwa": "^0.16.4", - "vitest": "^0.32.2", + "vitest": "^0.34.1", "vue-i18n-extract": "^2.0.4" } } From a8e5d8fcc5eac68c6701d2d01e1a26eb91681662 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 8 Sep 2023 17:23:08 +0200 Subject: [PATCH 122/134] zint: set platforms --- pkgs/development/libraries/zint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/zint/default.nix b/pkgs/development/libraries/zint/default.nix index 15aecee196d0..69ec64ada9d2 100644 --- a/pkgs/development/libraries/zint/default.nix +++ b/pkgs/development/libraries/zint/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/zint/zint/blob/${version}/ChangeLog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ azahi ]; + platforms = platforms.all; }; } From ef7ff5259e4290274213bb05784b1adfa88e4f2c Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 8 Sep 2023 11:36:14 -0400 Subject: [PATCH 123/134] gtree: 1.9.8 -> 1.9.9 Diff: https://github.com/ddddddO/gtree/compare/v1.9.8...v1.9.9 Changelog: https://github.com/ddddddO/gtree/releases/tag/v1.9.9 --- pkgs/tools/text/gtree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index 11bffaac3548..91a21ea6794c 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gtree"; - version = "1.9.8"; + version = "1.9.9"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-S0sI+IXilq8U275GExS54IQ3tPNI6iTCqMl/yzbRO/c="; + hash = "sha256-CBD01MIKrd/KSQvJg9xyS7V/ed/nfQ2CQe8C3Z9+lwM="; }; vendorHash = "sha256-QxcDa499XV43p8fstENOtfe3iZ176R5/Ub5iovXlYIM="; From bb5082a2340a8786b8da363ce7a0a3756141769d Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 8 Sep 2023 10:27:47 -0400 Subject: [PATCH 124/134] ttop: 1.2.3 -> 1.2.4 Diff: https://github.com/inv2004/ttop/compare/v1.2.3...v1.2.4 Changelog: https://github.com/inv2004/ttop/releases/tag/v1.2.4 --- pkgs/tools/system/ttop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ttop/default.nix b/pkgs/tools/system/ttop/default.nix index c09f028d006e..d36d49252206 100644 --- a/pkgs/tools/system/ttop/default.nix +++ b/pkgs/tools/system/ttop/default.nix @@ -2,14 +2,14 @@ nimPackages.buildNimPackage (finalAttrs: { pname = "ttop"; - version = "1.2.3"; + version = "1.2.4"; nimBinOnly = true; src = fetchFromGitHub { owner = "inv2004"; repo = "ttop"; rev = "v${finalAttrs.version}"; - hash = "sha256-YrPlE+vCA1ffV1y9QCh2W66L78HZfDRbGOflkwWLqGA="; + hash = "sha256-kOYgqFKZ0TC54o6tQaxGA1i12sU8Mg9bEwbGoZiBZ0Y="; }; buildInputs = with nimPackages; [ asciigraph illwill jsony parsetoml zippy ]; From 9fc09f19b2b410d50adcd1417a85952b2a36d4bc Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Fri, 8 Sep 2023 17:38:20 +0200 Subject: [PATCH 125/134] organicmaps: remove broken flag on aarch64-linux --- pkgs/applications/misc/organicmaps/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index f0d4a10dd6d5..e5bd2f46aba5 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { meta = with lib; { # darwin: "invalid application of 'sizeof' to a function type" - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; homepage = "https://organicmaps.app/"; description = "Detailed Offline Maps for Travellers, Tourists, Hikers and Cyclists"; license = licenses.asl20; From 0a4413e9fc1d060c6bb26fdd7c85bed67006fb3b Mon Sep 17 00:00:00 2001 From: Alistair Grant Date: Fri, 8 Sep 2023 08:23:36 +0200 Subject: [PATCH 126/134] maintainers-list: add akgrant43 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1e6fe5abc5b4..909b202da29c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -605,6 +605,12 @@ githubId = 65275785; name = "Alexander Kenji Berthold"; }; + akgrant43 = { + name = "Alistair Grant"; + email = "akg1012@fastmail.com.au"; + github = "akgrant43"; + githubId = 2062166; + }; akho = { name = "Alexander Khodyrev"; email = "a@akho.name"; From 4667f482fffe11c2b02087105fc90548d7204356 Mon Sep 17 00:00:00 2001 From: Alistair Grant Date: Fri, 8 Sep 2023 08:27:08 +0200 Subject: [PATCH 127/134] glamoroustoolkit: init at v0.7.2 Includes significant feedback from Anderson Torres to refactor derivation to meet guidelines. Co-authored-by: Anderson Torres --- .../GlamorousToolkit-GetImage | 25 +++++ .../tools/glamoroustoolkit/default.nix | 103 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 130 insertions(+) create mode 100755 pkgs/development/tools/glamoroustoolkit/GlamorousToolkit-GetImage create mode 100644 pkgs/development/tools/glamoroustoolkit/default.nix diff --git a/pkgs/development/tools/glamoroustoolkit/GlamorousToolkit-GetImage b/pkgs/development/tools/glamoroustoolkit/GlamorousToolkit-GetImage new file mode 100755 index 000000000000..20c2c315a350 --- /dev/null +++ b/pkgs/development/tools/glamoroustoolkit/GlamorousToolkit-GetImage @@ -0,0 +1,25 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash --packages curl +# +# Download the latest GlamorousToolkit image to the current directory, which must be empty +# +set -e + +if [ ! -z "$(ls)" ] +then + echo "Warning: the directory is not empty, continuing may overwrite some files" + read -p "Continue? (Y/N): " confirm && [[ $confirm == [yY] || $confirm == [yY][eE][sS] ]] || exit 1 +fi + +GTVERSION=$(curl -s https://api.github.com/repos/feenkcom/gtoolkit/releases/latest 2>/dev/null | grep tag_name | cut -d '"' -f 4) +if [ -z "$GTVERSION" ] +then + echo "Failed to get Gt Version string, exiting..." + exit 1 +fi + +curl -L \ + -o gt-image.zip \ + https://github.com/feenkcom/gtoolkit/releases/download/${GTVERSION}/GlamorousToolkit-Linux-x86_64-${GTVERSION}.zip +unzip gt-image.zip +rm -rf bin lib diff --git a/pkgs/development/tools/glamoroustoolkit/default.nix b/pkgs/development/tools/glamoroustoolkit/default.nix new file mode 100644 index 000000000000..b53983037a53 --- /dev/null +++ b/pkgs/development/tools/glamoroustoolkit/default.nix @@ -0,0 +1,103 @@ +{ lib +, stdenv +, fetchzip +, cairo +, dbus +, fontconfig +, freetype +, glib +, gtk3 +, libX11 +, libXcursor +, libXext +, libXi +, libXrandr +, libXrender +, libglvnd +, libuuid +, libxcb +, makeWrapper +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "glamoroustoolkit"; + version = "0.7.2"; + + src = fetchzip { + url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; + stripRoot = false; + hash = "sha256-Tahe/P0sxmuhSG5JxOkyQGLTOyVrjMEkxvzPc2CBV0Y="; + }; + + sourceRoot = "."; + + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + + installPhase = '' + runHook preInstall + + install -d $out/bin $out/lib + cp -r $src/bin $src/lib $out/ + cp ${./GlamorousToolkit-GetImage} $out/bin/GlamorousToolkit-GetImage + + runHook postInstall + ''; + +preFixup = let + libPath = lib.makeLibraryPath [ + cairo + dbus + fontconfig + freetype + glib + gtk3 + libX11 + libXcursor + libXext + libXi + libXrandr + libXrender + libglvnd + libuuid + libxcb + stdenv.cc.cc.lib + ]; + in '' + chmod +x $out/lib/*.so + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:$out/lib" \ + $out/bin/GlamorousToolkit $out/bin/GlamorousToolkit-cli + patchelf --shrink-rpath \ + $out/bin/GlamorousToolkit $out/bin/GlamorousToolkit-cli + patchelf \ + --set-rpath "${libPath}:$out/lib" \ + $out/lib/*.so + patchelf --shrink-rpath $out/lib/*.so + # + # shrink-rpath gets it wrong for the following libraries, + # restore the full rpath. + # + patchelf \ + --set-rpath "${libPath}:$out/lib" \ + $out/lib/libPharoVMCore.so \ + $out/lib/libWinit.so \ + $out/lib/libPixels.so + patchelf --set-rpath $out/lib $out/lib/libssl.so + + ln -s $out/lib/libcrypto.so $out/lib/libcrypto.so.1.1 + ln -s $out/lib/libcairo.so $out/lib/libcairo.so.2 + ln -s $out/lib/libgit2.so $out/lib/libgit2.so.1.1 + ''; + + meta = { + homepage = "https://gtoolkit.com"; + description = "The GlamorousToolkit Development Environment"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.akgrant43 ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 401eb75075eb..75a97301a437 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -682,6 +682,8 @@ with pkgs; glade = callPackage ../development/tools/glade { }; + glamoroustoolkit = callPackage ../development/tools/glamoroustoolkit { }; + gobble = callPackage ../tools/X11/gobble { }; goda = callPackage ../development/tools/goda { }; From 8d945f43659f783c74a895e6fa39e3dd0e03fd60 Mon Sep 17 00:00:00 2001 From: Alistair Grant Date: Fri, 8 Sep 2023 16:25:58 +0200 Subject: [PATCH 128/134] glamoroustoolkit: 0.7.2 -> 0.7.3 --- pkgs/development/tools/glamoroustoolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/glamoroustoolkit/default.nix b/pkgs/development/tools/glamoroustoolkit/default.nix index b53983037a53..814eb368929e 100644 --- a/pkgs/development/tools/glamoroustoolkit/default.nix +++ b/pkgs/development/tools/glamoroustoolkit/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "0.7.2"; + version = "0.7.3"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-Tahe/P0sxmuhSG5JxOkyQGLTOyVrjMEkxvzPc2CBV0Y="; + hash = "sha256-xkGip3RN44SZhYbogxUabO2EDsrRUZAJ+qAOEGdBgQ4="; }; sourceRoot = "."; From 5db0bf375d4913cd52a2aade1116dc43ad566d45 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Fri, 8 Sep 2023 12:28:32 -0400 Subject: [PATCH 129/134] maintainers: update techknowlogick email --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1e6fe5abc5b4..64c9f6030931 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16827,7 +16827,7 @@ name = "Andy Tockman"; }; techknowlogick = { - email = "techknowlogick@gitea.io"; + email = "techknowlogick@gitea.com"; github = "techknowlogick"; githubId = 164197; name = "techknowlogick"; From 5ee2279901a1847bd3e5ab4d3338f71dd5e2dd04 Mon Sep 17 00:00:00 2001 From: MultisampledNight Date: Fri, 8 Sep 2023 18:54:16 +0200 Subject: [PATCH 130/134] neovide: 0.11.1 -> 0.11.2 https://github.com/neovide/neovide/releases/tag/0.11.2 --- pkgs/applications/editors/neovim/neovide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index 6fd974656663..ccd7d754e44c 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -25,16 +25,16 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pname = "neovide"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "neovide"; repo = "neovide"; rev = version; - sha256 = "sha256-zvpeDaLQvFQn5VfG6lsula/20AF3Oitsq7bLn8TkUiE="; + sha256 = "sha256-JCSFG7W4I1uXsVM7J059tHYq/DB16AZfGjsG0UvfctE="; }; - cargoSha256 = "sha256-4PgwIdi511ScTLwrz89nf/YPJwEKMUgUKbKxLDzBViM="; + cargoSha256 = "sha256-rH4jjbd0C1MKu3RE0bLvLo4iqyUXr0DvCudvFs1F+AA="; SKIA_SOURCE_DIR = let From 695cfcb515613ca2cf07edf7962f75022f7b4ac0 Mon Sep 17 00:00:00 2001 From: Tiaguinho Date: Fri, 8 Sep 2023 15:45:14 +0100 Subject: [PATCH 131/134] maintainers: add coffeeispower --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 909b202da29c..2405cb66335a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3343,6 +3343,12 @@ githubId = 5561189; name = "Cody Opel"; }; + coffeeispower = { + email = "tiagodinis33@proton.me"; + github = "coffee-is-power"; + name = "Tiago Dinis"; + githubId = 92828847; + }; cofob = { name = "Egor Ternovoy"; email = "cofob@riseup.net"; From c054b2a07bce2be3b85fed85f45aea6a4b97f5cc Mon Sep 17 00:00:00 2001 From: Tiaguinho Date: Fri, 8 Sep 2023 15:19:08 +0100 Subject: [PATCH 132/134] bun: 0.8.1 -> 1.0.0 --- pkgs/development/web/bun/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 4520cbd22c13..12c77b3b6540 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -11,7 +11,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.8.1"; + version = "1.0.0"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -35,19 +35,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-R0+2MevBE98WNsjGsfBrMJyvc0jadLQ9lJIvoekGiBk="; + hash = "sha256-Bd8KL1IbWBRiMZq4YPhNLdhBOqRReCFeUPAilLfk0TM="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-fdn3yEavJUEwcUiyr9vd/0yVzkuJLwTvVeIaLcZkKhs="; + hash = "sha256-CHOiQ47wXjkFyJG9ElE9gBpmWpylMEUf6c+Sm+YCpGc="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-dGu06A/6d/OtyXcmJCVZsODkLIvP7Zd0w6vnuLWuI1I="; + hash = "sha256-0AT58hjawS60q5YAQd/upVz0vOIs11JM+lc3c1mGyOE="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-BZ1Ymu2WexC4Ad3cS0Zo9K6WtYL8rlqIYWprk1MyOsg="; + hash = "sha256-1ju7ZuW82wRfXEiU24Lx9spCoIhhddJ2p4dTTQmsa7A="; }; }; updateScript = writeShellScript "update-bun" '' From 2d41cc62f5734cec455a5d6d4f3c25b4034d86f7 Mon Sep 17 00:00:00 2001 From: Tiaguinho Date: Fri, 8 Sep 2023 15:46:09 +0100 Subject: [PATCH 133/134] bun: add coffeeispower as a maintainer --- pkgs/development/web/bun/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 12c77b3b6540..ef1e19a3daf7 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -76,7 +76,7 @@ stdenvNoCC.mkDerivation rec { mit # bun core lgpl21Only # javascriptcore and webkit ]; - maintainers = with maintainers; [ DAlperin jk thilobillerbeck cdmistman ]; + maintainers = with maintainers; [ DAlperin jk thilobillerbeck cdmistman coffeeispower ]; platforms = builtins.attrNames passthru.sources; }; } From 6f2a7f88d45484d493cee4b7aa3a315efc17b1ec Mon Sep 17 00:00:00 2001 From: Tiaguinho Date: Fri, 8 Sep 2023 15:56:54 +0100 Subject: [PATCH 134/134] bun: fix changelog link --- pkgs/development/web/bun/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index ef1e19a3daf7..81ec06e2d432 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -66,7 +66,7 @@ stdenvNoCC.mkDerivation rec { }; meta = with lib; { homepage = "https://bun.sh"; - changelog = "https://bun.sh/blog/bun-v${version}"; + changelog = "https://bun.sh/blog/bun-v1.0"; # 1.0 changelog does not use the full version name, please change this to ${version} in the following releases description = "Incredibly fast JavaScript runtime, bundler, transpiler and package manager – all in one"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; longDescription = ''