From e90acad35f33b883b6627ec28998fe883e303b02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 13 Feb 2023 11:23:25 -0800 Subject: [PATCH 001/169] python310Packages.aioresponses: don't depend on asynctest It isn't needed for Python >= 3.8. --- pkgs/development/python-modules/aioresponses/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index a5936a6a9b0f..ba7f7274271e 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -1,6 +1,5 @@ { lib , aiohttp -, asynctest , buildPythonPackage , ddt , fetchPypi @@ -32,7 +31,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest ddt pytestCheckHook ]; From a411a116a5d91a8d7ce260a05fe48142366138e4 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Wed, 8 Mar 2023 18:25:34 +0100 Subject: [PATCH 002/169] openafs: Fix configure option; Add tools --with-gssapi is usually not used anymore and is replaced by --with-krb5 Add tools that handle volume dumps; search, list and extract files from them. --- pkgs/servers/openafs/1.8/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index 8ebed1c27464..bc164c9b963a 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation { configureFlagsArray=( - "--with-gssapi" + "--with-krb5" "--sysconfdir=/etc" "--localstatedir=/var" "--disable-kernel-module" @@ -108,6 +108,8 @@ stdenv.mkDerivation { cp "doc/xml/''${d}"/*.html "$doc/share/doc/openafs/''${d}" done + cp src/tools/dumpscan/{afsdump_dirlist,afsdump_extract,afsdump_scan,dumptool} $out/bin + rm -r $out/lib/openafs '' + optionalString withDevdoc '' mkdir -p $devdoc/share/devhelp/openafs/doxygen From b34aec224d234a75adada4afd29326ac71842b97 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Thu, 1 Sep 2022 13:10:13 +0800 Subject: [PATCH 003/169] material-color-utilities-python: init at 0.1.5 --- .../material-color-utilities/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/material-color-utilities/default.nix diff --git a/pkgs/development/python-modules/material-color-utilities/default.nix b/pkgs/development/python-modules/material-color-utilities/default.nix new file mode 100644 index 000000000000..ed224b244f4b --- /dev/null +++ b/pkgs/development/python-modules/material-color-utilities/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, pillow, regex }: + +buildPythonPackage rec { + pname = "material-color-utilities-python"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-PG8C585wWViFRHve83z3b9NijHyV+iGY2BdMJpyVH64="; + }; + + propagatedBuildInputs = [ + pillow + regex + ]; + + # No tests implemented. + doCheck = false; + + pythonImportsCheck = [ "material_color_utilities_python" ]; + + meta = with lib; { + homepage = "https://pypi.org/project/material_color_utilities_python"; + description = "Python port of material_color_utilities used for Material You colors"; + license = licenses.asl20; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f24f353537b6..879c9d5fbb75 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5832,6 +5832,8 @@ self: super: with self; { mat2 = callPackage ../development/python-modules/mat2 { }; + material-color-utilities = callPackage ../development/python-modules/material-color-utilities { }; + matchpy = callPackage ../development/python-modules/matchpy { }; mathlibtools = callPackage ../development/python-modules/mathlibtools { }; From ba0a1611fcd67b826eaa8f7dc238105aec93d3c7 Mon Sep 17 00:00:00 2001 From: oddlama Date: Fri, 24 Mar 2023 18:38:52 +0100 Subject: [PATCH 004/169] nixos/nginx: fix warning about duplicate mime entry --- nixos/modules/services/web-servers/nginx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 064c86a9a7e2..a18690fa4c0e 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -31,6 +31,7 @@ let # Mime.types values are taken from brotli sample configuration - https://github.com/google/ngx_brotli # and Nginx Server Configs - https://github.com/h5bp/server-configs-nginx + # "text/html" is implicitly included in {brotli,gzip,zstd}_types compressMimeTypes = [ "application/atom+xml" "application/geo+json" @@ -55,7 +56,6 @@ let "text/calendar" "text/css" "text/csv" - "text/html" "text/javascript" "text/markdown" "text/plain" From 6f81910b71906a979580ffd33b51b5fc704aa9d2 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Sat, 25 Mar 2023 10:11:04 +0000 Subject: [PATCH 005/169] =?UTF-8?q?python310Packages.django-compression-mi?= =?UTF-8?q?ddleware:=200.4.2=20=E2=86=92=200.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../python-modules/django-compression-middleware/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-compression-middleware/default.nix b/pkgs/development/python-modules/django-compression-middleware/default.nix index 7857ae74834b..c26ee8434dd8 100644 --- a/pkgs/development/python-modules/django-compression-middleware/default.nix +++ b/pkgs/development/python-modules/django-compression-middleware/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "django-compression-middleware"; - version = "0.4.2"; + version = "0.5.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-cdS80JVGz4h4MVCsZGfrQWhZlTR3Swm4Br4wFxOcKVs="; + hash = "sha256-DfUPEtd0ZZq8i7yI5MeU8nhajxHzC1uyZ8MUuF2UG3M="; }; propagatedBuildInputs = [ From 99f9668726e337caa646734c88507538ec6455bf Mon Sep 17 00:00:00 2001 From: LeixB Date: Sun, 26 Mar 2023 18:14:05 +0200 Subject: [PATCH 006/169] yuview: 2.12.1 -> 2.13 --- pkgs/applications/video/yuview/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/yuview/default.nix b/pkgs/applications/video/yuview/default.nix index 440782a8b70a..7df47d3f4256 100644 --- a/pkgs/applications/video/yuview/default.nix +++ b/pkgs/applications/video/yuview/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "yuview"; - version = "2.12.1"; + version = "2.13"; src = fetchFromGitHub { owner = "IENT"; repo = "YUView"; - rev = "v${version}"; - sha256 = "sha256-BQnlq6TBxGbwqn6lAZGBo4+2HeXdFYL33LKqKSXMvdY="; + rev = "v.${version}"; + sha256 = "sha256-2mNIuyY/ni+zkUc8V/iXUEa7JeBJyOnNod7friMYAm8="; }; nativeBuildInputs = [ qmake wrapQtAppsHook ]; From d505646da5516457d258f88e76f02852e221bc03 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Mar 2023 21:09:47 +0200 Subject: [PATCH 007/169] python310Packages.tree-sitter: init at 0.20.1 --- .../python-modules/tree-sitter/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/tree-sitter/default.nix diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix new file mode 100644 index 000000000000..541051c8690c --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "tree-sitter"; + version = "0.20.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "tree_sitter"; + inherit version; + hash = "sha256-6T8ILFRdZkm8+11oHtJV6wBKbOIpiJcaEo9AaS/uxg0="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + # PyPI tarball doesn't contains tests and source has additional requirements + doCheck = false; + + pythonImportsCheck = [ + "tree_sitter" + ]; + + meta = with lib; { + description = "Python bindings to the Tree-sitter parsing library"; + homepage = "https://github.com/tree-sitter/py-tree-sitter"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f24f353537b6..aed6a9db5c96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11871,6 +11871,8 @@ self: super: with self; { trectools = callPackage ../development/python-modules/trectools { }; + tree-sitter = callPackage ../development/python-modules/tree-sitter { }; + treelog = callPackage ../development/python-modules/treelog { }; treeo = callPackage ../development/python-modules/treeo { }; From 982cecf911134e7642489508907bcdf46efc8544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Madrid-Menc=C3=ADa?= Date: Mon, 27 Mar 2023 22:56:21 +0200 Subject: [PATCH 008/169] tuckr: 0.7.1 -> 0.8.0 --- pkgs/applications/misc/tuckr/Cargo.lock | 803 +++++++++++++++++++++++ pkgs/applications/misc/tuckr/default.nix | 13 +- 2 files changed, 808 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/misc/tuckr/Cargo.lock diff --git a/pkgs/applications/misc/tuckr/Cargo.lock b/pkgs/applications/misc/tuckr/Cargo.lock new file mode 100644 index 000000000000..fbbc68894a3f --- /dev/null +++ b/pkgs/applications/misc/tuckr/Cargo.lock @@ -0,0 +1,803 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aead" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "ansi-str" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84252a7e1a0df81706ce70bbad85ed1e4916448a4093ccd52dd98c6a44a477cd" +dependencies = [ + "ansitok", +] + +[[package]] +name = "ansitok" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "220044e6a1bb31ddee4e3db724d29767f352de47445a6cd75e1a173142136c83" +dependencies = [ + "nom", + "vte", +] + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bytecount" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chacha20" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fc89c7c5b9e7a02dfe45cd2367bae382f9ed31c61ca8debe5f827c420a2f08" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "chacha20poly1305" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", + "zeroize", +] + +[[package]] +name = "clap" +version = "4.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c911b090850d79fc64fe9ea01e28e465f65e821e08813ced95bced72f7a8a9b" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", +] + +[[package]] +name = "clap_derive" +version = "4.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a932373bab67b984c790ddf2c9ca295d8e3af3b7ef92de5a5bacdccdee4b09b" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.10", +] + +[[package]] +name = "clap_lex" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "cpufeatures" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" +dependencies = [ + "libc", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core", + "typenum", +] + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" +dependencies = [ + "hermit-abi", + "io-lifetimes", + "rustix", + "windows-sys", +] + +[[package]] +name = "libc" +version = "0.2.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "os_str_bytes" +version = "6.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "papergrid" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1526bb6aa9f10ec339fb10360f22c57edf81d5678d0278e93bc12a47ffbe4b01" +dependencies = [ + "ansi-str", + "ansitok", + "bytecount", + "fnv", + "unicode-width", +] + +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "rpassword" +version = "7.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +dependencies = [ + "libc", + "rtoolbox", + "winapi", +] + +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "rustix" +version = "0.36.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tabled" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c3ee73732ffceaea7b8f6b719ce3bb17f253fa27461ffeaf568ebd0cdb4b85" +dependencies = [ + "ansi-str", + "papergrid", + "tabled_derive", + "unicode-width", +] + +[[package]] +name = "tabled_derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beca1b4eaceb4f2755df858b88d9b9315b7ccfd1ffd0d7a48a52602301f01a57" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.10", +] + +[[package]] +name = "tuckr" +version = "0.8.0" +dependencies = [ + "chacha20poly1305", + "clap", + "dirs", + "owo-colors", + "rand", + "rpassword", + "sha2", + "tabled", + "walkdir", + "zeroize", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "unicode-ident" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "universal-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vte" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983" +dependencies = [ + "arrayvec", + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "walkdir" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "zeroize" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" diff --git a/pkgs/applications/misc/tuckr/default.nix b/pkgs/applications/misc/tuckr/default.nix index 4223d6d9b44d..df0f63920af8 100644 --- a/pkgs/applications/misc/tuckr/default.nix +++ b/pkgs/applications/misc/tuckr/default.nix @@ -2,21 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "tuckr"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "RaphGL"; repo = "Tuckr"; rev = version; - sha256 = "sha256-47qnBGCiPWJGF4QcqjzmDIZWlCO3xE3QyIF6nSPGWAc="; + sha256 = "sha256-S4mHNCyK7WGYRBckxQkwA3+eu7QhUyKkOZ/KqhMJf+s="; }; - cargoHash = "sha256-IX7ZX4fKBK0wS7nlSdf/bVGzXl2GU7qwwmtPMoOe/m8="; - - # Cargo.lock is outdated - preConfigure = '' - cargo update --offline - ''; + cargoLock = { + lockFile = ./Cargo.lock; + }; doCheck = false; # test result: FAILED. 5 passed; 3 failed; From deab2b3bf768fc6158142e4d59e20ef016197438 Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 28 Mar 2023 19:09:54 +0000 Subject: [PATCH 009/169] nixos/auto-cpufreq: Add configuration support. --- .../modules/services/hardware/auto-cpufreq.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/nixos/modules/services/hardware/auto-cpufreq.nix b/nixos/modules/services/hardware/auto-cpufreq.nix index 9698e72eb31e..5a8b7c8e43c5 100644 --- a/nixos/modules/services/hardware/auto-cpufreq.nix +++ b/nixos/modules/services/hardware/auto-cpufreq.nix @@ -2,21 +2,39 @@ with lib; let cfg = config.services.auto-cpufreq; + cfgFilename = "auto-cpufreq.conf"; + cfgFile = format.generate cfgFilename cfg.settings; + + format = pkgs.formats.ini {}; in { options = { services.auto-cpufreq = { enable = mkEnableOption (lib.mdDoc "auto-cpufreq daemon"); + + settings = mkOption { + description = lib.mdDoc '' + Configuration for `auto-cpufreq`. + + See its [example configuration file] for supported settings. + [example configuration file]: https://github.com/AdnanHodzic/auto-cpufreq/blob/master/auto-cpufreq.conf-example + ''; + + default = {}; + type = types.submodule { freeformType = format.type; }; + }; }; }; config = mkIf cfg.enable { environment.systemPackages = [ pkgs.auto-cpufreq ]; + environment.etc.${cfgFilename}.source = cfgFile; systemd = { packages = [ pkgs.auto-cpufreq ]; services.auto-cpufreq = { # Workaround for https://github.com/NixOS/nixpkgs/issues/81138 wantedBy = [ "multi-user.target" ]; + restartTriggers = [ cfgFile ]; path = with pkgs; [ bash coreutils ]; }; }; From 7ec7922b04f6775b2fb3416fd85cea26e7480f81 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 19 Jan 2023 19:49:38 +0300 Subject: [PATCH 010/169] nixos/tests/nginx: update test script --- nixos/tests/nginx.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix index d9d073822a14..2a7e0f48d868 100644 --- a/nixos/tests/nginx.nix +++ b/nixos/tests/nginx.nix @@ -67,10 +67,10 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; testScript = { nodes, ... }: let - etagSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/etagSystem"; - justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/justReloadSystem"; - reloadRestartSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/reloadRestartSystem"; - reloadWithErrorsSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/reloadWithErrorsSystem"; + etagSystem = "${nodes.webserver.system.build.toplevel}/specialisation/etagSystem"; + justReloadSystem = "${nodes.webserver.system.build.toplevel}/specialisation/justReloadSystem"; + reloadRestartSystem = "${nodes.webserver.system.build.toplevel}/specialisation/reloadRestartSystem"; + reloadWithErrorsSystem = "${nodes.webserver.system.build.toplevel}/specialisation/reloadWithErrorsSystem"; in '' url = "http://localhost/index.html" From 0b39ed44dd08d37a9364cd39bc20f097c1fb07b7 Mon Sep 17 00:00:00 2001 From: Scott Zhu Reeves <327943+star-szr@users.noreply.github.com> Date: Sat, 1 Apr 2023 09:46:25 -0400 Subject: [PATCH 011/169] carapace: add ldflags for version With this change, `carapace --version` returns the correct version rather than `develop`. I tested a binary downloaded from their releases page and this is the correct format, there should not be a v prefix or anything else. --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/shells/carapace/default.nix | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b7f414317c3d..70700e0cbe0a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14349,6 +14349,12 @@ githubId = 6362238; name = "Christoph Honal"; }; + star-szr = { + email = "nixpkgs@scottr.mailworks.org"; + github = "star-szr"; + githubId = 327943; + name = "Scott Zhu Reeves"; + }; stasjok = { name = "Stanislav Asunkin"; email = "nixpkgs@stasjok.ru"; diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index b74085159098..dae5b9bc442d 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, carapace }: buildGoModule rec { pname = "carapace"; @@ -13,6 +13,12 @@ buildGoModule rec { vendorHash = "sha256-s8U0ERAb/qLwen8ABfeZ21HLTgHWvHaYHazztSeP87c="; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + subPackages = [ "./cmd/carapace" ]; tags = [ "release" ]; @@ -21,10 +27,12 @@ buildGoModule rec { go generate ./... ''; + passthru.tests.version = testers.testVersion { package = carapace; }; + meta = with lib; { description = "Multi-shell multi-command argument completer"; homepage = "https://rsteube.github.io/carapace-bin/"; - maintainers = with maintainers; [ mredaelli ]; + maintainers = with maintainers; [ star-szr ]; license = licenses.mit; platforms = platforms.unix; }; From 4e72d111e92555e993dff69c6f230246c6ce1795 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Fri, 5 Aug 2022 00:37:54 +0000 Subject: [PATCH 012/169] raspa: init at 2.0.47 and add tests --- .../science/molecular-dynamics/raspa/data.nix | 33 ++++++++ .../molecular-dynamics/raspa/default.nix | 79 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 116 insertions(+) create mode 100644 pkgs/applications/science/molecular-dynamics/raspa/data.nix create mode 100644 pkgs/applications/science/molecular-dynamics/raspa/default.nix diff --git a/pkgs/applications/science/molecular-dynamics/raspa/data.nix b/pkgs/applications/science/molecular-dynamics/raspa/data.nix new file mode 100644 index 000000000000..bcc9dc3b372e --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/raspa/data.nix @@ -0,0 +1,33 @@ +{ lib +, stdenvNoCC +, gzip +, raspa +}: + +stdenvNoCC.mkDerivation rec { + pname = "raspa-data"; + inherit (raspa) version src; + + outputs = [ "out" "doc" ]; + + nativeBuildInpuhs = [ gzip ]; + + installPhase = '' + runHook preInstall + mkdir -p "$out/share/raspa" + mv examples "$out/share/raspa" + mkdir -p "$doc/share/raspa" + mv -T "Docs" "$doc/share/raspa/doc" + runHook postInstall + ''; + + # Keep the shebangs of the examples from being patched + dontPatchShebangs = true; + + meta = with lib; { + inherit (raspa.meta) homepage license maintainers; + description = "Example packs and documentation of RASPA"; + outputsToInstall = [ "out" "doc" ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/science/molecular-dynamics/raspa/default.nix b/pkgs/applications/science/molecular-dynamics/raspa/default.nix new file mode 100644 index 000000000000..149db0504bf1 --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/raspa/default.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, makeWrapper +, fftw +, lapack +, openblas +, runCommandLocal +, raspa +, raspa-data +}: +stdenv.mkDerivation rec { + pname = "raspa"; + version = "2.0.47"; + + src = fetchFromGitHub { + owner = "iRASPA"; + repo = "RASPA2"; + rev = "v${version}"; + hash = "sha256-i8Y+pejiOuyPNJto+/0CmRoAnMljCrnDFx8qDh4I/68="; + }; + + nativeBuildInputs = [ + autoreconfHook + makeWrapper + ]; + + buildInputs = [ + fftw + lapack + openblas + ]; + + # Prepare for the Python binding packaging. + strictDeps = true; + + enableParallelBuilding = true; + + preAutoreconf = '' + mkdir "m4" + ''; + + postAutoreconf = '' + automake --add-missing + autoconf + ''; + + doCheck = true; + + # Wrap with RASPA_DIR + # so that users can run $out/bin/simulate directly + # without the need of a `run` srcipt. + postInstall = '' + wrapProgram "$out/bin/simulate" \ + --set RASPA_DIR "$out" + ''; + + passthru.tests.run-an-example = runCommandLocal "raspa-test-run-an-example" { } + '' + set -eu -o pipefail + exampleDir="${raspa-data}/share/raspa/examples/Basic/1_MC_Methane_in_Box" + exampleDirWritable="$(basename "$exampleDir")" + cp -rT "$exampleDir" "./$exampleDirWritable" + chmod u+rw -R "$exampleDirWritable" + cd "$exampleDirWritable" + ${raspa}/bin/simulate + touch "$out" + ''; + + meta = with lib; { + description = "A general purpose classical molecular simulation package"; + homepage = "https://iraspa.org/raspa/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ ShamrockLee ]; + mainProgram = "simulate"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb033db5acff..d63e419782a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37875,6 +37875,10 @@ with pkgs; pspp = callPackage ../applications/science/math/pspp { }; + raspa = callPackage ../applications/science/molecular-dynamics/raspa { }; + + raspa-data = callPackage ../applications/science/molecular-dynamics/raspa/data.nix { }; + ssw = callPackage ../applications/misc/ssw { }; pynac = callPackage ../applications/science/math/pynac { }; From f4b0afe9f56ced1adce1f6bc65c91e0fc880c6c3 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 1 Apr 2023 07:00:52 +0000 Subject: [PATCH 013/169] pre-commit: 3.1.0 -> 3.2.1 --- pkgs/tools/misc/pre-commit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index 7ea5b8e7ae32..fac2d23fa729 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -17,7 +17,7 @@ with python3Packages; buildPythonApplication rec { pname = "pre-commit"; - version = "3.1.0"; + version = "3.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonApplication rec { owner = "pre-commit"; repo = "pre-commit"; rev = "v${version}"; - hash = "sha256-riAXvpJmuQHOfruwebijiAgN2AvqpUUI07p758qO+4k="; + hash = "sha256-WRQdxFlTpLmQpX9x3swlkSr2iv0alSiCRtTjhQC164c="; }; patches = [ From 01ceca76ac21b5df4196f2d0d029b932b16846ff Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 4 Apr 2023 11:15:01 +0800 Subject: [PATCH 014/169] zeal: 0.6.20221022 -> 0.6.1.20230320 --- pkgs/data/documentation/zeal/default.nix | 29 ++++++++++++------------ 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 3a8b7122c7ff..27988d5ee565 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -17,15 +17,17 @@ let isQt5 = lib.versions.major qtbase.version == "5"; -in stdenv.mkDerivation rec { + +in +stdenv.mkDerivation rec { pname = "zeal"; - version = "0.6.20221022"; + version = "0.6.1.20230320"; src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; - rev = "7ea03e4bb9754020e902a2989f56f4bc42b85c82"; - sha256 = "sha256-BozRLlws56i9P7Qtc5qPZWgJR5yhYqnLQsEdsymt5us="; + rev = "a617ae5e06b95cec99bae058650e55b98613916d"; + hash = "sha256-WL2uqA0sZ5Q3lZIA9vkLVyfec/jBkfGcWb6XQ7AuM94="; }; # we only need this if we are using a version that hasn't been released. We @@ -39,16 +41,15 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules pkg-config wrapQtAppsHook ]; - buildInputs = - [ - qtbase - qtimageformats - qtwebengine - libarchive - libXdmcp - libpthreadstubs - xcbutilkeysyms - ] ++ lib.optionals isQt5 [ qtx11extras ]; + buildInputs = [ + qtbase + qtimageformats + qtwebengine + libarchive + libXdmcp + libpthreadstubs + xcbutilkeysyms + ] ++ lib.optionals isQt5 [ qtx11extras ]; meta = with lib; { description = "A simple offline API documentation browser"; From 64953434f2a34fa81f71989a1187e63a4ea0dbae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Apr 2023 17:59:36 +0000 Subject: [PATCH 015/169] matcha-gtk-theme: 2022-11-15 -> 2023-04-03 --- pkgs/data/themes/matcha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 570febd7114a..eccff020ce58 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ "aliz" "azul" "sea" "pueril" "a stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-11-15"; + version = "2023-04-03"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "Rx22O8C7kbYADxqJF8u6kdcQnXNA5aS+NWOnx/X4urY="; + sha256 = "mr9X7p/H8H2QKZxAQC9j/8OLK4D3EnWLxriFlh16diE="; }; nativeBuildInputs = [ From 85382d5b6848889dff5a721ee21d3edea4947fe7 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 5 Apr 2023 21:52:26 +0200 Subject: [PATCH 016/169] jenkins: 2.387.1 -> 2.387.2 https://www.jenkins.io/changelog-stable//#v2.387.2 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 34f0b58f4b41..9767f2e9289d 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.387.1"; + version = "2.387.2"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-wTKh4AtoWvx5luulML5CijJ5xkk5lBf5+jj8vA2+wCc="; + hash = "sha256-XjnLBtm56xijIYtFoHxru4Afs1O3dOtb93SfiRtQDKk="; }; nativeBuildInputs = [ makeWrapper ]; From 0dd0b2103a25d2068462895faa852d535666a977 Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Wed, 5 Apr 2023 23:04:35 +0200 Subject: [PATCH 017/169] forgejo: use "predictable URLs" as src Not sure how long codeberg.org already supports this. I only just found out about them after a maintainer mentioned them in https://matrix.to/#/#forgejo-chat:matrix.org Similar URLs are also used at https://forgejo.org/download/ --- pkgs/applications/version-management/forgejo/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 346d17d8c794..c6164f5251b3 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -28,9 +28,7 @@ buildGoModule rec { version = "1.19.0-2"; src = fetchurl { - name = "${pname}-src-${version}.tar.gz"; - # see https://codeberg.org/forgejo/forgejo/releases - url = "https://codeberg.org/attachments/2bf497db-fa91-4260-9c98-5c791b6b397c"; + url = "https://codeberg.org/forgejo/forgejo/releases/download/v${version}/forgejo-src-${version}.tar.gz"; hash = "sha256-neDIT+V3qHR8xgP4iy4TJQ6PCWO3svpSA7FLCacQSMI="; }; @@ -105,7 +103,6 @@ buildGoModule rec { | { $version, html_url } + (.assets | map(select(.name | startswith($filename)) | {(.name | split(".") | last): .browser_download_url}) | add)' \ <<< "$releases") - archive_url=$(jq -r .gz <<< "$stable") checksum_url=$(jq -r .sha256 <<< "$stable") release_url=$(jq -r .html_url <<< "$stable") version=$(jq -r .version <<< "$stable") @@ -120,7 +117,7 @@ buildGoModule rec { sha256=$(curl "$checksum_url" --silent | cut --delimiter " " --fields 1) sri_hash=$(nix hash to-sri --type sha256 "$sha256") - update-source-version "${pname}" "$version" "$sri_hash" "$archive_url" + update-source-version "${pname}" "$version" "$sri_hash" ''; }); }; From 9f1a1b9373cb1fe754bbcd318a1789ec1f691398 Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Wed, 5 Apr 2023 23:04:35 +0200 Subject: [PATCH 018/169] forgejo: 1.19.0-2 -> 1.19.0-3 https://codeberg.org/forgejo/forgejo/src/commit/4c132e77ea2cba9a1161f4cfc18b82b9e2e1b35f/RELEASE-NOTES.md#1-19-0-3 --- pkgs/applications/version-management/forgejo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index c6164f5251b3..25cce789bc88 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -25,11 +25,11 @@ buildGoModule rec { pname = "forgejo"; - version = "1.19.0-2"; + version = "1.19.0-3"; src = fetchurl { url = "https://codeberg.org/forgejo/forgejo/releases/download/v${version}/forgejo-src-${version}.tar.gz"; - hash = "sha256-neDIT+V3qHR8xgP4iy4TJQ6PCWO3svpSA7FLCacQSMI="; + hash = "sha256-u27DDw3JUtVJ2nvkKfaGzpYP8bpRnwc1LUVra8Epkjc="; }; vendorHash = null; From 7c0fa2f34c838511a9a2fc9021b6552a72075c26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Apr 2023 05:21:23 +0000 Subject: [PATCH 019/169] python310Packages.dj-database-url: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/dj-database-url/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix index 55a3d408c4e8..6e679f19957d 100644 --- a/pkgs/development/python-modules/dj-database-url/default.nix +++ b/pkgs/development/python-modules/dj-database-url/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "dj-database-url"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-sjsVBGyzgYDgyVIHvMkP5enb3o7vFgZZB92Fz0ynA2w="; + hash = "sha256-h75ffEyD2bPYzpS4NPls6hSzmG82KarAl6/dkxjXsJg="; }; propagatedBuildInputs = [ From 082ee207f13c27b3b9e6a35fa3d1631e127580c5 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 12 Jan 2023 16:07:51 +0800 Subject: [PATCH 020/169] deepin.dde-dock: init at 5.5.81 --- .../desktops/deepin/core/dde-dock/default.nix | 89 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 90 insertions(+) create mode 100644 pkgs/desktops/deepin/core/dde-dock/default.nix diff --git a/pkgs/desktops/deepin/core/dde-dock/default.nix b/pkgs/desktops/deepin/core/dde-dock/default.nix new file mode 100644 index 000000000000..32e8ca97b6d1 --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-dock/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, lib +, fetchFromGitHub +, dtkwidget +, dde-qt-dbus-factory +, qt5integration +, qt5platform-plugins +, dde-control-center +, deepin-desktop-schemas +, cmake +, qttools +, qtx11extras +, pkg-config +, wrapQtAppsHook +, wrapGAppsHook +, gsettings-qt +, libdbusmenu +, xorg +, gtest +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "dde-dock"; + version = "5.5.81"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-x8U5QPfIykaQLjwbErZiYbZC+JyPQQ+jd6MBjDQyUjs="; + }; + + postPatch = '' + substituteInPlace plugins/tray/system-trays/systemtrayscontroller.cpp frame/controller/dockpluginscontroller.cpp \ + --replace "/usr/lib/dde-dock/plugins" "/run/current-system/sw/lib/dde-dock/plugins" + + substituteInPlace plugins/show-desktop/showdesktopplugin.cpp frame/window/components/desktop_widget.cpp \ + --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" + + substituteInPlace plugins/{dcc-dock-plugin/settings_module.cpp,tray/system-trays/systemtrayscontroller.cpp} \ + --replace "/usr" "$out" + ''; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + wrapGAppsHook + ]; + dontWrapGApps = true; + + buildInputs = [ + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + dde-control-center + deepin-desktop-schemas + qtx11extras + gsettings-qt + libdbusmenu + xorg.libXcursor + xorg.libXtst + xorg.libXdmcp + gtest + ]; + + outputs = [ "out" "dev" ]; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "Deepin desktop-environment - dock module"; + homepage = "https://github.com/linuxdeepin/dde-dock"; + platforms = platforms.linux; + license = licenses.lgpl3Plus; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index de924812f7a9..ca0fa28c895a 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -32,6 +32,7 @@ let #### CORE dde-control-center = callPackage ./core/dde-control-center { }; dde-calendar = callPackage ./core/dde-calendar { }; + dde-dock = callPackage ./core/dde-dock { }; dde-polkit-agent = callPackage ./core/dde-polkit-agent { }; dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { }; From ec1ecba26a6b8065fe5d931e51df40914d801995 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 12 Jan 2023 16:08:59 +0800 Subject: [PATCH 021/169] deepin.dde-launcher: init at 5.6.1 --- .../deepin/core/dde-launcher/default.nix | 73 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/desktops/deepin/core/dde-launcher/default.nix diff --git a/pkgs/desktops/deepin/core/dde-launcher/default.nix b/pkgs/desktops/deepin/core/dde-launcher/default.nix new file mode 100644 index 000000000000..cd73cf8dc7e0 --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-launcher/default.nix @@ -0,0 +1,73 @@ +{ stdenv +, lib +, fetchFromGitHub +, dtkwidget +, dde-qt-dbus-factory +, qt5integration +, qt5platform-plugins +, cmake +, qttools +, qtx11extras +, pkg-config +, wrapQtAppsHook +, wrapGAppsHook +, gsettings-qt +, gtest +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "dde-launcher"; + version = "5.6.1"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-Td8R91892tgJx7FLV2IZ/aPBzDb+o6EYKpk3D8On7Ag="; + }; + + postPatch = '' + substituteInPlace src/boxframe/{backgroundmanager.cpp,boxframe.cpp} \ + --replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" + substituteInPlace dde-launcher.desktop dde-launcher-wapper src/dbusservices/com.deepin.dde.Launcher.service \ + --replace "/usr" "$out" + ''; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + wrapGAppsHook + ]; + dontWrapGApps = true; + + buildInputs = [ + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + qtx11extras + gsettings-qt + gtest + ]; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "Deepin desktop-environment - Launcher module"; + homepage = "https://github.com/linuxdeepin/dde-launcher"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index ca0fa28c895a..00918e1b16f8 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -33,6 +33,7 @@ let dde-control-center = callPackage ./core/dde-control-center { }; dde-calendar = callPackage ./core/dde-calendar { }; dde-dock = callPackage ./core/dde-dock { }; + dde-launcher = callPackage ./core/dde-launcher { }; dde-polkit-agent = callPackage ./core/dde-polkit-agent { }; dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { }; From 43fa3347164a954ea933b81bb722384eda94a415 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 12 Jan 2023 16:11:30 +0800 Subject: [PATCH 022/169] deepin.dde-clipboard: init at 5.4.25 --- .../deepin/core/dde-clipboard/default.nix | 73 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/desktops/deepin/core/dde-clipboard/default.nix diff --git a/pkgs/desktops/deepin/core/dde-clipboard/default.nix b/pkgs/desktops/deepin/core/dde-clipboard/default.nix new file mode 100644 index 000000000000..47ec1c837b13 --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-clipboard/default.nix @@ -0,0 +1,73 @@ +{ stdenv +, lib +, fetchFromGitHub +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, gio-qt +, cmake +, qttools +, kwayland +, pkg-config +, wrapQtAppsHook +, glibmm +, gtest +}: + +stdenv.mkDerivation rec { + pname = "dde-clipboard"; + version = "5.4.25"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-oFATOBXf4NvGxjVMlfxwfQkBffeKut8ao+X6T9twb/I="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/etc/xdg" "$out/etc/xdg" \ + --replace "/lib/systemd/user" "$out/lib/systemd/user" \ + --replace "/usr/share" "$out/share" + + substituteInPlace misc/com.deepin.dde.Clipboard.service \ + --replace "/usr/bin/qdbus" "${lib.getBin qttools}/bin/qdbus" + + substituteInPlace misc/{dde-clipboard.desktop,dde-clipboard-daemon.service,com.deepin.dde.Clipboard.service} \ + --replace "/usr" "$out" + + patchShebangs translate_generation.sh generate_gtest_report.sh + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5integration + qt5platform-plugins + dde-qt-dbus-factory + gio-qt + kwayland + glibmm + gtest + ]; + + cmakeFlags = [ + "-DUSE_DEEPIN_WAYLAND=OFF" + ]; + + meta = with lib; { + description = "DDE optional clipboard manager componment"; + homepage = "https://github.com/linuxdeepin/dde-clipboard"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 00918e1b16f8..e21db54a6cb9 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -32,6 +32,7 @@ let #### CORE dde-control-center = callPackage ./core/dde-control-center { }; dde-calendar = callPackage ./core/dde-calendar { }; + dde-clipboard = callPackage ./core/dde-clipboard { }; dde-dock = callPackage ./core/dde-dock { }; dde-launcher = callPackage ./core/dde-launcher { }; dde-polkit-agent = callPackage ./core/dde-polkit-agent { }; From 920be30f437f5687bbe7d34f201185f90c0721e9 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 17 Mar 2023 15:19:00 +0100 Subject: [PATCH 023/169] principia: init at unstable-2023-03-21 --- pkgs/games/principia/default.nix | 98 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 100 insertions(+) create mode 100644 pkgs/games/principia/default.nix diff --git a/pkgs/games/principia/default.nix b/pkgs/games/principia/default.nix new file mode 100644 index 000000000000..3cf98dada027 --- /dev/null +++ b/pkgs/games/principia/default.nix @@ -0,0 +1,98 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config + +, curl +, freetype +, glew +, gtk2 +, libGL +, libjpeg +, libpng +, SDL2 +, SDL2_gfx +, SDL2_image +, SDL2_mixer +, SDL2_ttf +}: + +stdenv.mkDerivation { + pname = "principia"; + version = "unstable-2023-03-21"; + + src = fetchFromGitHub { + owner = "Bithack"; + repo = "principia"; + rev = "af2cfda21b6ce4c0725700e2a01b0597a97dbeff"; + hash = "sha256-jBWdXzbPpk23elHcs5sWkxXfkekj+aa24VvEHzid8KE="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + curl + freetype + glew + gtk2 + libGL + libjpeg + libpng + SDL2 + SDL2_gfx + SDL2_image + SDL2_mixer + SDL2_ttf + ]; + + preAutoreconf = '' + cd build-linux + ''; + + # Since we bypass the "build-linux/go" wrapper script so we can use nixpkgs' + # autotools/make integration, set the release flags manually. + # https://github.com/Bithack/principia/issues/98 + preBuild = '' + RELEASE_SHARED="-ffast-math -DNDEBUG=1 -s -fomit-frame-pointer -fvisibility=hidden -fdata-sections -ffunction-sections" + makeFlagsArray+=( + CFLAGS="$RELEASE_SHARED -O1" + CXXFLAGS="$RELEASE_SHARED -O2 -fvisibility-inlines-hidden -fno-rtti" + LDFLAGS="-Wl,-O,-s,--gc-sections" + ) + ''; + + # `make install` only installs the binary, and the binary looks for data + # files in its same directory, so we override installPhase, install the + # binary in $out/share, and link to it from $out/bin + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/share/principia + install -Dm755 principia $out/share/principia/principia + ln -s $out/share/principia/principia $out/bin/principia + + cp -r --dereference data-pc data-shared $out/share/principia/ + install -Dm644 principia.desktop $out/share/applications/principia.desktop + install -Dm644 principia-url-handler.desktop $out/share/applications/principia-url-handler.desktop + install -Dm644 principia.png $out/share/pixmaps/principia.png + + runHook postInstall + ''; + + # The actual binary is here, see comment above installPhase + stripDebugList = [ "share/principia" ]; + + meta = with lib; { + description = "Physics-based sandbox game"; + homepage = "https://principia-web.se/"; + downloadPage = "https://principia-web.se/download"; + license = licenses.bsd3; + maintainers = [ maintainers.fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 765682bcc040..d4d0638dcd4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35810,6 +35810,8 @@ with pkgs; planetary_annihilation = callPackage ../games/planetaryannihilation { }; + principia = callPackage ../games/principia { }; + prismlauncher-qt5 = libsForQt5.callPackage ../games/prismlauncher { }; prismlauncher = qt6Packages.callPackage ../games/prismlauncher { }; From b48842d5071e93fa3e16302baaa3d7cbffa14b18 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 12 Jan 2023 16:12:59 +0800 Subject: [PATCH 024/169] deepin.dde-app-services: init at 0.0.20 --- .../deepin/core/dde-app-services/default.nix | 56 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/desktops/deepin/core/dde-app-services/default.nix diff --git a/pkgs/desktops/deepin/core/dde-app-services/default.nix b/pkgs/desktops/deepin/core/dde-app-services/default.nix new file mode 100644 index 000000000000..b6ab01e7c2b7 --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-app-services/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchFromGitHub +, dtkwidget +, qt5integration +, qt5platform-plugins +, cmake +, wrapQtAppsHook +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "dde-app-services"; + version = "0.0.20"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-M9XXNV3N4CifOXitT6+UxaGsLoVuoNGqC5SO/mF+bLw="; + }; + + postPatch = '' + substituteInPlace dconfig-center/dde-dconfig-daemon/services/org.desktopspec.ConfigManager.service \ + --replace "/usr/bin/dde-dconfig-daemon" "$out/bin/dde-dconfig-daemon" + substituteInPlace dconfig-center/dde-dconfig/main.cpp \ + --replace "/bin/dde-dconfig-editor" "dde-dconfig-editor" + substituteInPlace dconfig-center/CMakeLists.txt \ + --replace 'add_subdirectory("example")' " " \ + --replace 'add_subdirectory("tests")' " " + ''; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5integration + qt5platform-plugins + ]; + + cmakeFlags = [ + "-DDVERSION=${version}" + "-DDSG_DATA_DIR=/run/current-system/sw/share/dsg" + ]; + + meta = with lib; { + description = "Provids dbus service for reading and writing DSG configuration"; + homepage = "https://github.com/linuxdeepin/dde-app-services"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index e21db54a6cb9..3b43e9ae2137 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -30,6 +30,7 @@ let udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; #### CORE + dde-app-services = callPackage ./core/dde-app-services { }; dde-control-center = callPackage ./core/dde-control-center { }; dde-calendar = callPackage ./core/dde-calendar { }; dde-clipboard = callPackage ./core/dde-clipboard { }; From 6ee20da0650c7343a576ac7caac4fc34b9246a28 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 12 Jan 2023 16:15:00 +0800 Subject: [PATCH 025/169] deepin.dde-session-shell: init at 5.6.4 --- .../deepin/core/dde-session-shell/default.nix | 112 ++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 113 insertions(+) create mode 100644 pkgs/desktops/deepin/core/dde-session-shell/default.nix diff --git a/pkgs/desktops/deepin/core/dde-session-shell/default.nix b/pkgs/desktops/deepin/core/dde-session-shell/default.nix new file mode 100644 index 000000000000..ac5f5fbc7ec0 --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-session-shell/default.nix @@ -0,0 +1,112 @@ +{ stdenv +, lib +, fetchFromGitHub +, linkFarm +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, cmake +, pkg-config +, qttools +, qtx11extras +, wrapQtAppsHook +, wrapGAppsHook +, gsettings-qt +, lightdm_qt +, linux-pam +, xorg +, kwayland +, gtest +, xkeyboard_config +, dbus +, qtbase +, dde-session-shell +}: +stdenv.mkDerivation rec { + pname = "dde-session-shell"; + version = "5.6.4"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-mrdGu4t86d3No23IrnjypVLx1jxaySatr0xPMY9l5S4"; + }; + + postPatch = '' + substituteInPlace src/lightdm-deepin-greeter/greeterworker.cpp \ + --replace "/usr/include/shadow.h" "shadow.h" + + substituteInPlace scripts/lightdm-deepin-greeter files/wayland/lightdm-deepin-greeter-wayland \ + --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" + + substituteInPlace src/session-widgets/auth_module.h \ + --replace "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center" + + substituteInPlace src/global_util/plugin_manager/modules_loader.cpp \ + --replace "/usr/lib/dde-session-shell/modules" "/run/current-system/sw/lib/dde-session-shell/modules" + + substituteInPlace src/{session-widgets/{lockcontent.cpp,userinfo.cpp},widgets/fullscreenbackground.cpp} \ + --replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" + + substituteInPlace src/global_util/xkbparser.h \ + --replace "/usr/share/X11/xkb/rules/base.xml" "${xkeyboard_config}/share/X11/xkb/rules/base.xml" + + substituteInPlace files/{com.deepin.dde.shutdownFront.service,com.deepin.dde.lockFront.service} \ + --replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" \ + --replace "/usr/share" "$out/share" + + substituteInPlace src/global_util/{public_func.cpp,constants.h} scripts/lightdm-deepin-greeter files/{dde-lock.desktop,lightdm-deepin-greeter.desktop,wayland/lightdm-deepin-greeter-wayland.desktop} \ + --replace "/usr" "$out" + + patchShebangs files/deepin-greeter + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + wrapGAppsHook + ]; + dontWrapGApps = true; + + buildInputs = [ + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + gsettings-qt + lightdm_qt + qtx11extras + linux-pam + kwayland + xorg.libXcursor + xorg.libXtst + xorg.libXrandr + xorg.libXdmcp + gtest + ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + passthru.xgreeters = linkFarm "deepin-greeter-xgreeters" [{ + path = "${dde-session-shell}/share/xgreeters/lightdm-deepin-greeter.desktop"; + name = "lightdm-deepin-greeter.desktop"; + }]; + + meta = with lib; { + description = "Deepin desktop-environment - session-shell module"; + homepage = "https://github.com/linuxdeepin/dde-session-shell"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 3b43e9ae2137..efef25cbac8e 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -36,6 +36,7 @@ let dde-clipboard = callPackage ./core/dde-clipboard { }; dde-dock = callPackage ./core/dde-dock { }; dde-launcher = callPackage ./core/dde-launcher { }; + dde-session-shell = callPackage ./core/dde-session-shell { }; dde-polkit-agent = callPackage ./core/dde-polkit-agent { }; dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { }; From 0c8b3d428520c7bf7ecaf1d374f5e47f56266c0f Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 12 Jan 2023 16:16:22 +0800 Subject: [PATCH 026/169] deepin.dde-session-ui: init at 5.6.2 --- .../deepin/core/dde-session-ui/default.nix | 108 ++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 109 insertions(+) create mode 100644 pkgs/desktops/deepin/core/dde-session-ui/default.nix diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix new file mode 100644 index 000000000000..d07389c6646e --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-session-ui/default.nix @@ -0,0 +1,108 @@ +{ stdenv +, lib +, fetchFromGitHub +, dtkwidget +, qt5integration +, qt5platform-plugins +, pkg-config +, cmake +, dde-dock +, dde-qt-dbus-factory +, deepin-gettext-tools +, gsettings-qt +, lightdm_qt +, qttools +, qtx11extras +, util-linux +, xorg +, pcre +, libselinux +, libsepol +, wrapQtAppsHook +, gtest +, xkeyboard_config +, qtbase +, dbus +}: + +stdenv.mkDerivation rec { + pname = "dde-session-ui"; + version = "5.6.2"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-3lW/M07b6gXzGcvQYB+Ojqdq7TfJBaMIKfmfG7o3wWg="; + }; + + postPatch = '' + substituteInPlace widgets/fullscreenbackground.cpp \ + --replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" \ + --replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers" + + substituteInPlace global_util/xkbparser.h \ + --replace "/usr/share/X11/xkb/rules/base.xml" "${xkeyboard_config}/share/X11/xkb/rules/base.xml" + + substituteInPlace dde-warning-dialog/com.deepin.dde.WarningDialog.service dde-osd/files/dde-osd.desktop dde-welcome/com.deepin.dde.welcome.service \ + --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" + + substituteInPlace dde-osd/notification/bubbletool.cpp \ + --replace "/usr/share" "/run/current-system/sw/share" + + substituteInPlace dde-osd/files/{com.deepin.dde.Notification.service,com.deepin.dde.freedesktop.Notification.service,com.deepin.dde.osd.service} \ + --replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" \ + --replace "/usr/share" "$out/share" + + substituteInPlace dde-lowpower/main.cpp dmemory-warning-dialog/main.cpp dde-touchscreen-dialog/main.cpp dnetwork-secret-dialog/main.cpp dde-suspend-dialog/main.cpp \ + dde-warning-dialog/main.cpp dde-bluetooth-dialog/main.cpp dde-welcome/main.cpp dde-hints-dialog/main.cpp dde-osd/main.cpp dde-wm-chooser/main.cpp \ + dde-license-dialog/{content.cpp,main.cpp} dmemory-warning-dialog/com.deepin.dde.MemoryWarningDialog.service \ + --replace "/usr" "$out" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + deepin-gettext-tools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + dde-dock + dde-qt-dbus-factory + gsettings-qt + qtx11extras + pcre + xorg.libXdmcp + util-linux + libselinux + libsepol + gtest + ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = '' + for binary in $out/lib/deepin-daemon/*; do + wrapProgram $binary "''${qtWrapperArgs[@]}" + done + ''; + + meta = with lib; { + description = "Deepin desktop-environment - Session UI module"; + homepage = "https://github.com/linuxdeepin/dde-session-ui"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index efef25cbac8e..fda8091d5be6 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -37,6 +37,7 @@ let dde-dock = callPackage ./core/dde-dock { }; dde-launcher = callPackage ./core/dde-launcher { }; dde-session-shell = callPackage ./core/dde-session-shell { }; + dde-session-ui = callPackage ./core/dde-session-ui { }; dde-polkit-agent = callPackage ./core/dde-polkit-agent { }; dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { }; From cd15ccf8d0b9e569ea79ce157f4c2d1ede58bf3e Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 12 Jan 2023 16:17:52 +0800 Subject: [PATCH 027/169] deepin.dde-network-core: init at 1.1.8 --- .../deepin/core/dde-network-core/default.nix | 78 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/desktops/deepin/core/dde-network-core/default.nix diff --git a/pkgs/desktops/deepin/core/dde-network-core/default.nix b/pkgs/desktops/deepin/core/dde-network-core/default.nix new file mode 100644 index 000000000000..6c192471525e --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-network-core/default.nix @@ -0,0 +1,78 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, qttools +, pkg-config +, wrapQtAppsHook +, dtkwidget +, dde-dock +, dde-control-center +, dde-session-shell +, dde-qt-dbus-factory +, gsettings-qt +, gio-qt +, networkmanager-qt +, glib +, pcre +, util-linux +, libselinux +, libsepol +, dbus +, gtest +, qtbase +}: +stdenv.mkDerivation rec { + pname = "dde-network-core"; + version = "1.1.8"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-ysmdB9CT7mhN/0r8CRT4FQsK12HkhjbezGXwWiNScqg="; + }; + + postPatch = '' + substituteInPlace dock-network-plugin/networkplugin.cpp dcc-network-plugin/dccnetworkmodule.cpp dss-network-plugin/network_module.cpp \ + --replace "/usr/share" "$out/share" + substituteInPlace dss-network-plugin/notification/bubbletool.cpp \ + --replace "/usr/share" "/run/current-system/sw/share" + ''; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + dde-dock + dde-control-center + dde-session-shell + dde-qt-dbus-factory + gsettings-qt + gio-qt + networkmanager-qt + glib + pcre + util-linux + libselinux + libsepol + gtest + ]; + + cmakeFlags = [ + "-DVERSION=${version}" + ]; + + meta = with lib; { + description = "DDE network library framework"; + homepage = "https://github.com/linuxdeepin/dde-network-core"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index fda8091d5be6..be32d4c56156 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -36,6 +36,7 @@ let dde-clipboard = callPackage ./core/dde-clipboard { }; dde-dock = callPackage ./core/dde-dock { }; dde-launcher = callPackage ./core/dde-launcher { }; + dde-network-core = callPackage ./core/dde-network-core { }; dde-session-shell = callPackage ./core/dde-session-shell { }; dde-session-ui = callPackage ./core/dde-session-ui { }; dde-polkit-agent = callPackage ./core/dde-polkit-agent { }; From 9ee68d484a442c6f79d5f0e077fc3b644008b06f Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 12 Jan 2023 15:53:51 +0800 Subject: [PATCH 028/169] deepin.dde-daemon: init at 5.14.122 --- pkgs/desktops/deepin/default.nix | 1 + .../0001-fix-wrapped-name-for-verifyExe.patch | 33 ++ .../dde-daemon/0002-dont-set-PATH.patch | 40 +++ .../0003-search-in-XDG-directories.patch | 257 ++++++++++++++ .../0004-aviod-use-hardcode-path.patch | 323 ++++++++++++++++++ .../deepin/go-package/dde-daemon/default.nix | 151 ++++++++ .../deepin/go-package/dde-daemon/deps.nix | 290 ++++++++++++++++ 7 files changed, 1095 insertions(+) create mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/0001-fix-wrapped-name-for-verifyExe.patch create mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/0002-dont-set-PATH.patch create mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/0003-search-in-XDG-directories.patch create mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/0004-aviod-use-hardcode-path.patch create mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/default.nix create mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/deps.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index de924812f7a9..a770a270033c 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -57,6 +57,7 @@ let go-gir-generator = callPackage ./go-package/go-gir-generator { }; go-dbus-factory = callPackage ./go-package/go-dbus-factory { }; dde-api = callPackage ./go-package/dde-api { inherit replaceAll; }; + dde-daemon = callPackage ./go-package/dde-daemon { }; deepin-pw-check = callPackage ./go-package/deepin-pw-check { }; deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { }; diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/0001-fix-wrapped-name-for-verifyExe.patch b/pkgs/desktops/deepin/go-package/dde-daemon/0001-fix-wrapped-name-for-verifyExe.patch new file mode 100644 index 000000000000..6eb7ad2c362f --- /dev/null +++ b/pkgs/desktops/deepin/go-package/dde-daemon/0001-fix-wrapped-name-for-verifyExe.patch @@ -0,0 +1,33 @@ +From ad18742c699a08cd82f8926a31da9a19b2aef329 Mon Sep 17 00:00:00 2001 +From: rewine +Date: Wed, 5 Apr 2023 23:37:24 +0800 +Subject: [PATCH 1/4] fix-wrapped-name-for-verifyExe + +--- + dock/process_info.go | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/dock/process_info.go b/dock/process_info.go +index 83c61d58..e2970f3a 100644 +--- a/dock/process_info.go ++++ b/dock/process_info.go +@@ -119,6 +119,16 @@ func verifyExe(exe, cwd, firstArg string) bool { + return false + } + logger.Debugf("firstArgPath: %q", firstArgPath) ++ if exe == firstArgPath { ++ return true ++ } ++ if strings.HasSuffix(exe, "-wrapped") { ++ exeBase := filepath.Base(exe) ++ if (len(exeBase) <= 9) { ++ return false ++ } ++ exe = exe[0:len(exe)-len(exeBase)] + exeBase[1:len(exeBase)-8] ++ } + return exe == firstArgPath + } + +-- +2.39.2 + diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/0002-dont-set-PATH.patch b/pkgs/desktops/deepin/go-package/dde-daemon/0002-dont-set-PATH.patch new file mode 100644 index 000000000000..cf69496105c5 --- /dev/null +++ b/pkgs/desktops/deepin/go-package/dde-daemon/0002-dont-set-PATH.patch @@ -0,0 +1,40 @@ +From 7fe41aac7c31f6143b5f5887dbefa41fdf4c252b Mon Sep 17 00:00:00 2001 +From: rewine +Date: Wed, 5 Apr 2023 23:37:49 +0800 +Subject: [PATCH 2/4] dont-set-PATH + +--- + bin/dde-system-daemon/main.go | 4 ---- + grub2/modify_manger.go | 1 - + 2 files changed, 5 deletions(-) + +diff --git a/bin/dde-system-daemon/main.go b/bin/dde-system-daemon/main.go +index 03d2a415..cf92f065 100644 +--- a/bin/dde-system-daemon/main.go ++++ b/bin/dde-system-daemon/main.go +@@ -77,10 +77,6 @@ func main() { + // fix no PATH when was launched by dbus + if os.Getenv("PATH") == "" { + logger.Warning("No PATH found, manual special") +- err = os.Setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin") +- if err != nil { +- logger.Warning(err) +- } + } + + // 系统级服务，无需设置LANG和LANGUAGE，保证翻译不受到影响 +diff --git a/grub2/modify_manger.go b/grub2/modify_manger.go +index a811770b..30e9561e 100644 +--- a/grub2/modify_manger.go ++++ b/grub2/modify_manger.go +@@ -21,7 +21,6 @@ const ( + ) + + func init() { +- _ = os.Setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin") + } + + type modifyManager struct { +-- +2.39.2 + diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/0003-search-in-XDG-directories.patch b/pkgs/desktops/deepin/go-package/dde-daemon/0003-search-in-XDG-directories.patch new file mode 100644 index 000000000000..29d86e3fa957 --- /dev/null +++ b/pkgs/desktops/deepin/go-package/dde-daemon/0003-search-in-XDG-directories.patch @@ -0,0 +1,257 @@ +From 528f590c0c81728c324444fd76e0f7113a2e3dc4 Mon Sep 17 00:00:00 2001 +From: rewine +Date: Wed, 5 Apr 2023 23:41:25 +0800 +Subject: [PATCH 3/4] search-in-XDG-directories + +--- + accounts/manager.go | 5 ++++- + accounts/user.go | 8 +++++++- + appearance/fsnotify.go | 21 +++++++++++++++++---- + apps/utils.go | 3 ++- + dock/desktop_file_path.go | 6 ++++++ + gesture/config.go | 4 ++-- + keybinding/shortcuts/system_shortcut.go | 4 +++- + mime/app_info.go | 7 ++++++- + system/gesture/config.go | 4 +++- + 9 files changed, 50 insertions(+), 12 deletions(-) + +diff --git a/accounts/manager.go b/accounts/manager.go +index a5abb157..3fd7c153 100644 +--- a/accounts/manager.go ++++ b/accounts/manager.go +@@ -15,6 +15,7 @@ import ( + "sync" + "syscall" + ++ "github.com/adrg/xdg" + dbus "github.com/godbus/dbus" + "github.com/linuxdeepin/dde-daemon/accounts/users" + "github.com/linuxdeepin/dde-daemon/common/sessionmsg" +@@ -35,8 +36,10 @@ const ( + actConfigFile = actConfigDir + "/accounts.ini" + actConfigGroupGroup = "Accounts" + actConfigKeyGuest = "AllowGuest" ++) + +- interfacesFile = "/usr/share/dde-daemon/accounts/dbus-udcp.json" ++var ( ++ interfacesFile, _ = xdg.SearchDataFile("dde-daemon/accounts/dbus-udcp.json") + ) + + type InterfaceConfig struct { +diff --git a/accounts/user.go b/accounts/user.go +index 99138941..56a7731a 100644 +--- a/accounts/user.go ++++ b/accounts/user.go +@@ -15,6 +15,7 @@ import ( + "strings" + "sync" + ++ "github.com/adrg/xdg" + dbus "github.com/godbus/dbus" + "github.com/linuxdeepin/dde-daemon/accounts/users" + authenticate "github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.authenticate" +@@ -645,7 +646,12 @@ func getUserSession(homeDir string) string { + } + + func getSessionList() []string { +- fileInfoList, err := ioutil.ReadDir("/usr/share/xsessions") ++ xsessionPath, err := xdg.SearchDataFile("xsessions") ++ if err != nil { ++ return nil; ++ } ++ ++ fileInfoList, err := ioutil.ReadDir(xsessionPath) + if err != nil { + return nil + } +diff --git a/appearance/fsnotify.go b/appearance/fsnotify.go +index a409d0ba..ff674600 100644 +--- a/appearance/fsnotify.go ++++ b/appearance/fsnotify.go +@@ -5,12 +5,15 @@ + package appearance + + import ( ++ "errors" ++ "io/fs" + "os" + "path" + "path/filepath" + "strings" + "time" + ++ "github.com/adrg/xdg" + "github.com/fsnotify/fsnotify" + "github.com/linuxdeepin/dde-daemon/appearance/background" + "github.com/linuxdeepin/dde-daemon/appearance/subthemes" +@@ -100,9 +103,14 @@ func (m *Manager) watchGtkDirs() { + gtkDirs = []string{ + path.Join(home, ".local/share/themes"), + path.Join(home, ".themes"), +- "/usr/local/share/themes", +- "/usr/share/themes", + } ++ for _, dataPath := range xdg.DataDirs { ++ gtkPath := filepath.Join(dataPath, "themes"); ++ if _, err := os.Stat(gtkPath); err != nil && errors.Is(err, fs.ErrNotExist) { ++ continue ++ } ++ gtkDirs = append(gtkDirs, gtkPath); ++ } + + m.watchDirs(gtkDirs) + } +@@ -112,9 +120,14 @@ func (m *Manager) watchIconDirs() { + iconDirs = []string{ + path.Join(home, ".local/share/icons"), + path.Join(home, ".icons"), +- "/usr/local/share/icons", +- "/usr/share/icons", + } ++ for _, dataPath := range xdg.DataDirs { ++ iconPath := filepath.Join(dataPath, "icons"); ++ if _, err := os.Stat(iconPath); err != nil && errors.Is(err, fs.ErrNotExist) { ++ continue ++ } ++ iconDirs = append(iconDirs, iconPath); ++ } + + m.watchDirs(iconDirs) + } +diff --git a/apps/utils.go b/apps/utils.go +index 8863d6c2..dd6f8e16 100644 +--- a/apps/utils.go ++++ b/apps/utils.go +@@ -11,6 +11,7 @@ import ( + "strconv" + "strings" + "syscall" ++ "github.com/adrg/xdg" + ) + + func intSliceContains(slice []int, a int) bool { +@@ -96,7 +97,7 @@ func removeDesktopExt(name string) string { + } + + func getSystemDataDirs() []string { +- return []string{"/usr/share", "/usr/local/share"} ++ return xdg.DataDirs + } + + // get user home +diff --git a/dock/desktop_file_path.go b/dock/desktop_file_path.go +index 7adc9f55..e1a97679 100644 +--- a/dock/desktop_file_path.go ++++ b/dock/desktop_file_path.go +@@ -7,6 +7,8 @@ package dock + import ( + "path/filepath" + "strings" ++ ++ "github.com/adrg/xdg" + ) + + var pathDirCodeMap map[string]string +@@ -20,6 +22,10 @@ func initPathDirCodeMap() { + "/usr/local/share/applications/": "/L@", + } + ++ for _, dataPath := range xdg.DataDirs { ++ pathDirCodeMap[dataPath] = "/S@" ++ } ++ + dir := filepath.Join(homeDir, ".local/share/applications") + dir = addDirTrailingSlash(dir) + pathDirCodeMap[dir] = "/H@" +diff --git a/gesture/config.go b/gesture/config.go +index bfbd4db7..4ce9d641 100644 +--- a/gesture/config.go ++++ b/gesture/config.go +@@ -10,6 +10,7 @@ import ( + "io/ioutil" + "path/filepath" + ++ "github.com/adrg/xdg" + "github.com/linuxdeepin/go-lib/xdg/basedir" + ) + +@@ -21,11 +22,10 @@ const ( + + var ( + configUserPath = filepath.Join(basedir.GetUserConfigDir(), "deepin/dde-daemon/gesture.json") ++ configSystemPath, _ = xdg.SearchDataFile("dde-daemon/gesture.json") + ) + + const ( +- configSystemPath = "/usr/share/dde-daemon/gesture.json" +- + gestureSchemaId = "com.deepin.dde.gesture" + gsKeyTouchPadEnabled = "touch-pad-enabled" + gsKeyTouchScreenEnabled = "touch-screen-enabled" +diff --git a/keybinding/shortcuts/system_shortcut.go b/keybinding/shortcuts/system_shortcut.go +index d33a69f6..c3138099 100644 +--- a/keybinding/shortcuts/system_shortcut.go ++++ b/keybinding/shortcuts/system_shortcut.go +@@ -10,6 +10,7 @@ import ( + "path" + "sync" + ++ "github.com/adrg/xdg" + dutils "github.com/linuxdeepin/go-lib/utils" + ) + +@@ -152,5 +153,6 @@ func getSystemActionsFile() string { + return file + } + +- return "" ++ filepath, _ := xdg.SearchDataFile(systemActionsFile) ++ return filepath; + } +diff --git a/mime/app_info.go b/mime/app_info.go +index 63fcdcc0..18436164 100644 +--- a/mime/app_info.go ++++ b/mime/app_info.go +@@ -9,6 +9,7 @@ import ( + "os" + "path" + ++ "github.com/adrg/xdg" + "github.com/linuxdeepin/go-lib/appinfo/desktopappinfo" + "github.com/linuxdeepin/go-lib/mime" + dutils "github.com/linuxdeepin/go-lib/utils" +@@ -162,5 +163,9 @@ func findFilePath(file string) string { + return data + } + +- return path.Join("/usr/share", file) ++ filepath, err := xdg.SearchDataFile(file) ++ if err != nil { ++ return path.Join("/usr/share", file) ++ } ++ return filepath; + } +diff --git a/system/gesture/config.go b/system/gesture/config.go +index d4aebaac..f3fc92c3 100644 +--- a/system/gesture/config.go ++++ b/system/gesture/config.go +@@ -8,6 +8,7 @@ import ( + "encoding/json" + "io/ioutil" + ++ "github.com/adrg/xdg" + "github.com/linuxdeepin/go-lib/utils" + ) + +@@ -35,5 +36,6 @@ func getConfigPath() string { + if utils.IsFileExist(filename) { + return filename + } +- return "/usr/share/" + suffix ++ filepath, _ := xdg.SearchDataFile(suffix) ++ return filepath; + } +-- +2.39.2 + diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/0004-aviod-use-hardcode-path.patch b/pkgs/desktops/deepin/go-package/dde-daemon/0004-aviod-use-hardcode-path.patch new file mode 100644 index 000000000000..f47bed99b293 --- /dev/null +++ b/pkgs/desktops/deepin/go-package/dde-daemon/0004-aviod-use-hardcode-path.patch @@ -0,0 +1,323 @@ +From 12a5ccce245f82c334e78d48354e55311c15fb0c Mon Sep 17 00:00:00 2001 +From: rewine +Date: Wed, 5 Apr 2023 23:51:58 +0800 +Subject: [PATCH 4/4] aviod-use-hardcode-path + +--- + accounts/user.go | 2 +- + accounts/user_chpwd_union_id.go | 9 ++++----- + bin/backlight_helper/ddcci/ddcci.go | 20 +++++-------------- + bin/dde-authority/fprint_transaction.go | 2 +- + inputdevices/keyboard.go | 5 +++-- + keybinding/shortcuts/system_shortcut.go | 6 +++--- + keybinding/special_keycode.go | 2 +- + keybinding/utils.go | 2 +- + launcher/manager_ifc.go | 2 +- + .../dde-daemon/keybinding/system_actions.json | 4 ++-- + misc/etc/acpi/powerbtn.sh | 2 +- + misc/udev-rules/80-deepin-fprintd.rules | 2 +- + system/display/displaycfg.go | 2 +- + system/power/manager_lmt.go | 3 ++- + system/power_manager/utils.go | 2 +- + system/systeminfo/manager.go | 2 +- + systeminfo/utils.go | 2 +- + 17 files changed, 30 insertions(+), 39 deletions(-) + +diff --git a/accounts/user.go b/accounts/user.go +index f8827fb2..ff604f38 100644 +--- a/accounts/user.go ++++ b/accounts/user.go +@@ -450,7 +450,7 @@ func (u *User) checkIsControlCenter(sender dbus.Sender) bool { + return false + } + +- if exe == controlCenterPath { ++ if strings.Contains(exe, "dde-control-center") { + return true + } + +diff --git a/accounts/user_chpwd_union_id.go b/accounts/user_chpwd_union_id.go +index b0ba9cb9..e8aa1a1e 100644 +--- a/accounts/user_chpwd_union_id.go ++++ b/accounts/user_chpwd_union_id.go +@@ -107,14 +107,13 @@ func newCaller(service *dbusutil.Service, sender dbus.Sender) (ret *caller, err + + // 只允许来自控制中心, 锁屏和 greetter 的调用 + var app string +- switch exe { +- case "/usr/bin/dde-control-center": ++ if (strings.Contains(exe, "dde-control-center")) { + app = "control-center" +- case "/usr/bin/dde-lock": ++ } else if (strings.Contains(exe, "dde-lock")) { + app = "lock" +- case "/usr/bin/lightdm-deepin-greeter": ++ } else if (strings.Contains(exe, "lightdm-deepin-greeter")) { + app = "greeter" +- default: ++ } else { + err = fmt.Errorf("set password with Union ID called by %s, which is not allow", exe) + return + } +diff --git a/bin/backlight_helper/ddcci/ddcci.go b/bin/backlight_helper/ddcci/ddcci.go +index 21653459..01a67e91 100644 +--- a/bin/backlight_helper/ddcci/ddcci.go ++++ b/bin/backlight_helper/ddcci/ddcci.go +@@ -15,10 +15,7 @@ import ( + "bytes" + "encoding/base64" + "fmt" +- "os/exec" +- "path/filepath" + "reflect" +- "strings" + "sync" + "unsafe" + +@@ -113,18 +110,11 @@ func newDDCCI() (*ddcci, error) { + return nil, err + } + +- content, err := exec.Command("/usr/bin/dpkg-architecture", "-qDEB_HOST_MULTIARCH").Output() // TODO: arch和rpm打包需要通过patch修改获取路径的方式 +- if err != nil { +- logger.Warning(err) +- } else { +- path := filepath.Join("/usr/lib", strings.TrimSpace(string(content)), "libddcutil.so.0") +- logger.Debug("so path:", path) +- cStr := C.CString(path) +- defer C.free(unsafe.Pointer(cStr)) +- ret := C.InitDDCCISo(cStr) +- if ret == -2 { +- logger.Debug("failed to initialize ddca_free_all_displays sym") +- } ++ cStr := C.CString("libddcutil.so.0") ++ defer C.free(unsafe.Pointer(cStr)) ++ ret := C.InitDDCCISo(cStr) ++ if ret == -2 { ++ logger.Debug("failed to initialize ddca_free_all_displays sym") + } + + return ddc, nil +diff --git a/bin/dde-authority/fprint_transaction.go b/bin/dde-authority/fprint_transaction.go +index 0e460ec3..b803d1c9 100644 +--- a/bin/dde-authority/fprint_transaction.go ++++ b/bin/dde-authority/fprint_transaction.go +@@ -461,7 +461,7 @@ func (tx *FPrintTransaction) End(sender dbus.Sender) *dbus.Error { + + func killFPrintDaemon() { + logger.Debug("kill fprintd") +- err := exec.Command("pkill", "-f", "/usr/lib/fprintd/fprintd").Run() ++ err := exec.Command("pkill", "fprintd").Run() + if err != nil { + logger.Warning("failed to kill fprintd:", err) + } +diff --git a/inputdevices/keyboard.go b/inputdevices/keyboard.go +index 6d05f662..ca29cecc 100644 +--- a/inputdevices/keyboard.go ++++ b/inputdevices/keyboard.go +@@ -10,6 +10,7 @@ import ( + "fmt" + "os" + "os/user" ++ "os/exec" + "path" + "regexp" + "strings" +@@ -51,7 +52,7 @@ const ( + kbdSystemConfig = "/etc/default/keyboard" + qtDefaultConfig = ".config/Trolltech.conf" + +- cmdSetKbd = "/usr/bin/setxkbmap" ++ cmdSetKbd = "setxkbmap" + ) + + type Keyboard struct { +@@ -704,7 +705,7 @@ func (kbd *Keyboard) handlePropertyNotifyEvent(ev *x.PropertyNotifyEvent) { + } + + func (kbd *Keyboard) shouldUseDDEKwin() bool { +- _, err := os.Stat("/usr/bin/kwin_no_scale") ++ _, err := exec.LookPath("kwin_no_scale") + return err == nil + } + +diff --git a/keybinding/shortcuts/system_shortcut.go b/keybinding/shortcuts/system_shortcut.go +index 95e1b222..95d82db7 100644 +--- a/keybinding/shortcuts/system_shortcut.go ++++ b/keybinding/shortcuts/system_shortcut.go +@@ -83,10 +83,10 @@ var defaultSysActionCmdMap = map[string]string{ + "launcher": "dbus-send --print-reply --dest=com.deepin.dde.Launcher /com/deepin/dde/Launcher com.deepin.dde.Launcher.Toggle", + "terminal": "/usr/lib/deepin-daemon/default-terminal", + "terminal-quake": "deepin-terminal --quake-mode", +- "lock-screen": "originmap=$(setxkbmap -query | grep option | awk -F ' ' '{print $2}');/usr/bin/setxkbmap -option grab:break_actions&&/usr/bin/xdotool key XF86Ungrab&&dbus-send --print-reply --dest=com.deepin.dde.lockFront /com/deepin/dde/lockFront com.deepin.dde.lockFront.Show&&/usr/bin/setxkbmap -option; setxkbmap -option $originmap", ++ "lock-screen": "originmap=$(setxkbmap -query | grep option | awk -F ' ' '{print $2}');setxkbmap -option grab:break_actions&&xdotool key XF86Ungrab&&dbus-send --print-reply --dest=com.deepin.dde.lockFront /com/deepin/dde/lockFront com.deepin.dde.lockFront.Show&&/usr/bin/setxkbmap -option; setxkbmap -option $originmap", + "logout": "dbus-send --print-reply --dest=com.deepin.dde.shutdownFront /com/deepin/dde/shutdownFront com.deepin.dde.shutdownFront.Show", + "deepin-screen-recorder": "dbus-send --print-reply --dest=com.deepin.ScreenRecorder /com/deepin/ScreenRecorder com.deepin.ScreenRecorder.stopRecord", +- "system-monitor": "/usr/bin/deepin-system-monitor", ++ "system-monitor": "deepin-system-monitor", + "color-picker": "dbus-send --print-reply --dest=com.deepin.Picker /com/deepin/Picker com.deepin.Picker.Show", + // screenshot actions: + "screenshot": screenshotCmdPrefix + "StartScreenshot", +@@ -104,7 +104,7 @@ var defaultSysActionCmdMap = map[string]string{ + "global-search": "/usr/libexec/dde-daemon/keybinding/shortcut-dde-grand-search.sh", + "switch-next-kbd-layout": "dbus-send --print-reply --dest=com.deepin.daemon.Keybinding /com/deepin/daemon/InputDevice/Keyboard com.deepin.daemon.InputDevice.Keyboard.ToggleNextLayout", + // cmd +- "calculator": "/usr/bin/deepin-calculator", ++ "calculator": "deepin-calculator", + "search": "/usr/libexec/dde-daemon/keybinding/shortcut-dde-grand-search.sh", + } + +diff --git a/keybinding/special_keycode.go b/keybinding/special_keycode.go +index d18c9a66..9704b241 100644 +--- a/keybinding/special_keycode.go ++++ b/keybinding/special_keycode.go +@@ -276,7 +276,7 @@ func (m *Manager) handlePower() { + } + m.systemTurnOffScreen() + case powerActionShowUI: +- cmd := "originmap=$(setxkbmap -query | grep option | awk -F ' ' '{print $2}');/usr/bin/setxkbmap -option grab:break_actions&&/usr/bin/xdotool key XF86Ungrab&&dbus-send --print-reply --dest=com.deepin.dde.lockFront /com/deepin/dde/shutdownFront com.deepin.dde.shutdownFront.Show&&/usr/bin/setxkbmap -option; setxkbmap -option $originmap" ++ cmd := "originmap=$(setxkbmap -query | grep option | awk -F ' ' '{print $2}');setxkbmap -option grab:break_actions&&xdotool key XF86Ungrab&&dbus-send --print-reply --dest=com.deepin.dde.lockFront /com/deepin/dde/shutdownFront com.deepin.dde.shutdownFront.Show&&setxkbmap -option; setxkbmap -option $originmap" + go func() { + locked, err := m.sessionManager.Locked().Get(0) + if err != nil { +diff --git a/keybinding/utils.go b/keybinding/utils.go +index 8e531369..261c88e8 100644 +--- a/keybinding/utils.go ++++ b/keybinding/utils.go +@@ -311,7 +311,7 @@ func readTinyFile(file string) ([]byte, error) { + } + + func shouldUseDDEKwin() bool { +- _, err := os.Stat("/usr/bin/kwin_no_scale") ++ _, err := exec.LookPath("kwin_no_scale") + return err == nil + } + +diff --git a/launcher/manager_ifc.go b/launcher/manager_ifc.go +index 440aa8e5..ad74f99f 100644 +--- a/launcher/manager_ifc.go ++++ b/launcher/manager_ifc.go +@@ -24,7 +24,7 @@ const ( + dbusObjPath = "/com/deepin/dde/daemon/Launcher" + dbusInterface = dbusServiceName + desktopMainSection = "Desktop Entry" +- launcherExecPath = "/usr/bin/dde-launcher" ++ launcherExecPath = "dde-launcher" + ) + + var errorInvalidID = errors.New("invalid ID") +diff --git a/misc/dde-daemon/keybinding/system_actions.json b/misc/dde-daemon/keybinding/system_actions.json +index 8de3f111..8048048e 100644 +--- a/misc/dde-daemon/keybinding/system_actions.json ++++ b/misc/dde-daemon/keybinding/system_actions.json +@@ -13,7 +13,7 @@ + "Action": "dbus-send --print-reply --dest=com.deepin.ScreenRecorder /com/deepin/ScreenRecorder com.deepin.ScreenRecorder.stopRecord" + }, + { +- "Action": "/usr/bin/deepin-system-monitor", ++ "Action": "deepin-system-monitor", + "Key": "system-monitor" + }, + { +@@ -21,7 +21,7 @@ + "Action": "dbus-send --print-reply --dest=com.deepin.Picker /com/deepin/Picker com.deepin.Picker.Show" + }, + { +- "Action": "originmap=$(setxkbmap -query | grep option | awk -F ' ' '{print $2}');/usr/bin/setxkbmap -option grab:break_actions&&/usr/bin/xdotool key XF86Ungrab&&dbus-send --print-reply --dest=com.deepin.dde.lockFront /com/deepin/dde/lockFront com.deepin.dde.lockFront.Show&&/usr/bin/setxkbmap -option; setxkbmap -option $originmap", ++ "Action": "originmap=$(setxkbmap -query | grep option | awk -F ' ' '{print $2}');setxkbmap -option grab:break_actions&&xdotool key XF86Ungrab&&dbus-send --print-reply --dest=com.deepin.dde.lockFront /com/deepin/dde/lockFront com.deepin.dde.lockFront.Show&&setxkbmap -option; setxkbmap -option $originmap", + "Key": "lock-screen" + }, + { +diff --git a/misc/etc/acpi/powerbtn.sh b/misc/etc/acpi/powerbtn.sh +index 5c536b9e..39c28987 100755 +--- a/misc/etc/acpi/powerbtn.sh ++++ b/misc/etc/acpi/powerbtn.sh +@@ -58,4 +58,4 @@ elif test "$XUSER" != "" && test -x /usr/bin/qdbus; then + fi + + # If all else failed, just initiate a plain shutdown. +-/sbin/shutdown -h now "Power button pressed" ++shutdown -h now "Power button pressed" +diff --git a/misc/udev-rules/80-deepin-fprintd.rules b/misc/udev-rules/80-deepin-fprintd.rules +index d3d3554a..9163b91c 100644 +--- a/misc/udev-rules/80-deepin-fprintd.rules ++++ b/misc/udev-rules/80-deepin-fprintd.rules +@@ -1 +1 @@ +-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_interface", ACTION=="add|remove", ENV{LIBFPRINT_DRIVER}!="" RUN+="/usr/bin/dbus-send --system --dest=com.deepin.daemon.Fprintd --print-reply /com/deepin/daemon/Fprintd com.deepin.daemon.Fprintd.TriggerUDevEvent" ++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_interface", ACTION=="add|remove", ENV{LIBFPRINT_DRIVER}!="" RUN+="@dbus@/bin/dbus-send --system --dest=com.deepin.daemon.Fprintd --print-reply /com/deepin/daemon/Fprintd com.deepin.daemon.Fprintd.TriggerUDevEvent" +diff --git a/system/display/displaycfg.go b/system/display/displaycfg.go +index 57b5871a..5b7757b4 100644 +--- a/system/display/displaycfg.go ++++ b/system/display/displaycfg.go +@@ -255,7 +255,7 @@ func (d *Display) doDetectSupportWayland(sender dbus.Sender) (bool, error) { + return false, err + } + var cmd *exec.Cmd +- if execPath == "/usr/bin/lightdm-deepin-greeter" { ++ if strings.Contains(execPath, "lightdm-deepin-greeter") { + cmd = exec.Command("runuser", "-u", "lightdm", "glxinfo") // runuser -u lightdm glxinfo + } else { + cmd = exec.Command("glxinfo") +diff --git a/system/power/manager_lmt.go b/system/power/manager_lmt.go +index e2bdb2af..baf32fbd 100644 +--- a/system/power/manager_lmt.go ++++ b/system/power/manager_lmt.go +@@ -8,6 +8,7 @@ import ( + "bufio" + "io/ioutil" + "os" ++ "os/exec" + "path/filepath" + "strings" + +@@ -28,7 +29,7 @@ const ( + const lowBatteryThreshold = 20.0 + + func isLaptopModeBinOk() bool { +- _, err := os.Stat(laptopModeBin) ++ _, err := exec.LookPath("laptop_mode") + return err == nil + } + +diff --git a/system/power_manager/utils.go b/system/power_manager/utils.go +index 93f433c2..ef603c96 100644 +--- a/system/power_manager/utils.go ++++ b/system/power_manager/utils.go +@@ -33,7 +33,7 @@ func canSuspend() bool { + } + + func detectVirtualMachine() (string, error) { +- out, err := exec.Command("/usr/bin/systemd-detect-virt").Output() ++ out, err := exec.Command("systemd-detect-virt").Output() + if err != nil { + return "", err + } +diff --git a/system/systeminfo/manager.go b/system/systeminfo/manager.go +index 5525ae36..daab2c44 100644 +--- a/system/systeminfo/manager.go ++++ b/system/systeminfo/manager.go +@@ -205,7 +205,7 @@ func filterUnNumber(value string) string { + + //执行命令：/usr/bin/getconf LONG_BIT 获取系统位数 + func (m *Manager) systemBit() string { +- output, err := exec.Command("/usr/bin/getconf", "LONG_BIT").Output() ++ output, err := exec.Command("getconf", "LONG_BIT").Output() + if err != nil { + return "64" + } +diff --git a/systeminfo/utils.go b/systeminfo/utils.go +index ed17aeb8..e919fb53 100644 +--- a/systeminfo/utils.go ++++ b/systeminfo/utils.go +@@ -39,7 +39,7 @@ func getMemoryFromFile(file string) (uint64, error) { + + //执行命令：/usr/bin/getconf LONG_BIT 获取系统位数 + func systemBit() string { +- output, err := exec.Command("/usr/bin/getconf", "LONG_BIT").Output() ++ output, err := exec.Command("getconf", "LONG_BIT").Output() + if err != nil { + return "64" + } +-- +2.39.2 + diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix new file mode 100644 index 000000000000..c97e6ca3c4e3 --- /dev/null +++ b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix @@ -0,0 +1,151 @@ +{ stdenv +, lib +, fetchFromGitHub +, substituteAll +, buildGoPackage +, pkg-config +, deepin-gettext-tools +, gettext +, python3 +, wrapGAppsHook +, go-dbus-factory +, go-gir-generator +, go-lib +, dde-api +, ddcutil +, alsa-lib +, glib +, gtk3 +, libgudev +, libinput +, libnl +, librsvg +, linux-pam +, libxcrypt +, networkmanager +, pulseaudio +, gdk-pixbuf-xlib +, tzdata +, xkeyboard_config +, runtimeShell +, xorg +, xdotool +, getconf +, dbus +}: + +buildGoPackage rec { + pname = "dde-daemon"; + version = "5.14.122"; + + goPackagePath = "github.com/linuxdeepin/dde-daemon"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-KoYMv4z4IGBH0O422PuFHrIgDBEkU08Vepax+00nrGE="; + }; + + patches = [ + ./0001-fix-wrapped-name-for-verifyExe.patch + ./0002-dont-set-PATH.patch + ./0003-search-in-XDG-directories.patch + (substituteAll { + src = ./0004-aviod-use-hardcode-path.patch; + inherit dbus; + }) + ]; + + postPatch = '' + substituteInPlace session/eventlog/{app_event.go,login_event.go} accounts/users/users_test.go \ + --replace "/bin/bash" "${runtimeShell}" + + substituteInPlace inputdevices/layout_list.go \ + --replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" + + substituteInPlace appearance/background/{background.go,custom_wallpapers.go} accounts/user.go bin/dde-system-daemon/wallpaper.go \ + --replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers" + + substituteInPlace appearance/manager.go timedate/zoneinfo/zone.go \ + --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + + substituteInPlace accounts/image_blur.go grub2/modify_manger.go \ + --replace "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api" + + substituteInPlace accounts/user_chpwd_union_id.go \ + --replace "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center" + + for file in $(grep "/usr/lib/deepin-daemon" * -nR |awk -F: '{print $1}') + do + sed -i 's|/usr/lib/deepin-daemon|/run/current-system/sw/lib/deepin-daemon|g' $file + done + + patchShebangs . + ''; + + goDeps = ./deps.nix; + + nativeBuildInputs = [ + pkg-config + deepin-gettext-tools + gettext + python3 + wrapGAppsHook + ]; + + buildInputs = [ + go-dbus-factory + go-gir-generator + go-lib + dde-api + ddcutil + linux-pam + libxcrypt + alsa-lib + glib + libgudev + gtk3 + gdk-pixbuf-xlib + networkmanager + libinput + libnl + librsvg + pulseaudio + tzdata + xkeyboard_config + ]; + + buildPhase = '' + runHook preBuild + addToSearchPath GOPATH "${go-dbus-factory}/share/gocode" + addToSearchPath GOPATH "${go-gir-generator}/share/gocode" + addToSearchPath GOPATH "${go-lib}/share/gocode" + addToSearchPath GOPATH "${dde-api}/share/gocode" + make -C go/src/${goPackagePath} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + make install DESTDIR="$out" PREFIX="/" -C go/src/${goPackagePath} + runHook postInstall + ''; + + postFixup = '' + for f in "$out"/lib/deepin-daemon/*; do + echo "Wrapping $f" + wrapGApp "$f" + done + mv $out/run/current-system/sw/lib/deepin-daemon/service-trigger $out/lib/deepin-daemon/ + rm -r $out/run + ''; + + meta = with lib; { + description = "Daemon for handling the deepin session settings"; + homepage = "https://github.com/linuxdeepin/dde-daemon"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/deps.nix b/pkgs/desktops/deepin/go-package/dde-daemon/deps.nix new file mode 100644 index 000000000000..16eaa254c2ff --- /dev/null +++ b/pkgs/desktops/deepin/go-package/dde-daemon/deps.nix @@ -0,0 +1,290 @@ +[ + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.5.1"; + sha256 = "sha256-B8kZ8yiWgallT7R2j1kSRJcJkSGFVf9ise+TpXa+7XY="; + }; + } + { + goPackagePath = "github.com/godbus/dbus"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "v5.1.0"; + sha256 = "sha256-JSPtmkGEStBEVrKGszeLCb7P38SzQKgMiDC3eDppXs0="; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.7.1"; + sha256 = "sha256-disUVIHiIDSj/go3APtJH8awSl8QwKRRFLKI7LRnl0w="; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://github.com/golang/sys"; + rev = "289d7a0edf712062d9f1484b07bdf2383f48802f"; + sha256 = "sha256-AzS/J3OocI7mA0xsIfQzyskNKVija7F2yvuts+EFJBs="; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://github.com/golang/xerrors"; + rev = "2f41105eb62f341cfe208d06de4ee3bdd3a083da"; + sha256 = "sha256-yZNeG+jcarcw/aOFhrhxWWE20r0P+/VJF4i/0JQfv1c="; + }; + } + { + goPackagePath = "gopkg.in/yaml.v3"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "496545a6307b2a7d7a710fd516e5e16e8ab62dbc"; + sha256 = "sha256-j8yDji+vqsitpRZirpb4w/Em8nstgf28wpwkcrOlxBk="; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI="; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.3.0"; + sha256 = "sha256-T753/EiD5Cpk6H2JFhd+s1gFvpNptG2XlEHxZF6dQaw="; + }; + } + { + goPackagePath = "github.com/linuxdeepin/go-x11-client"; + fetch = { + type = "git"; + url = "https://github.com/linuxdeepin/go-x11-client"; + rev = "0.6.9"; + sha256 = "sha256-xXNaXpFFHJN1fCFLoVrQFCXQ4ya+Kga55QWcJL/InkA="; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "5d4384ee4fb2527b0a1256a821ebfc92f91efefc"; + sha256 = "sha256-XA4Oj1gdmdV/F/+8kMI+DBxKPthZ768hbKsO3d9Gx90="; + }; + } + { + goPackagePath = "github.com/axgle/mahonia"; + fetch = { + type = "git"; + url = "https://github.com/axgle/mahonia"; + rev = "3358181d7394e26beccfae0ffde05193ef3be33a"; + sha256 = "0b8wsrxmv8a0cqbnsg55lpf29pxy2zw8azvgh3ck664lqpcfybhq"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://github.com/golang/text"; + rev = "v0.3.7"; + sha256 = "sha256-XpIbgE6MxWwDQQcPXr2NIsE2cev2+CIabi566TYGfHY="; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://github.com/golang/image"; + rev = "70e8d0d3baa9a699c3865c753cbfa8ae65bd86ce"; + sha256 = "sha256-oMbDIke/qQ6cp7JLNsMusf7EIUfuj0WavFVfI0lxTDs="; + }; + } + { + goPackagePath = "github.com/nfnt/resize"; + fetch = { + type = "git"; + url = "https://github.com/nfnt/resize"; + rev = "83c6a9932646f83e3267f353373d47347b6036b2"; + sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya"; + }; + } + { + goPackagePath = "github.com/Lofanmi/pinyin-golang"; + fetch = { + type = "git"; + url = "https://github.com/Lofanmi/pinyin-golang"; + rev = "1db892057f20c56a3286cc1517e0642dacbff54c"; + sha256 = "sha256-nhO6AYZ3vc7nwgmmfTlE6m33caY9gGZoKiSYvFLqHQc="; + }; + } + { + goPackagePath = "github.com/mozillazg/go-pinyin"; + fetch = { + type = "git"; + url = "https://github.com/mozillazg/go-pinyin"; + rev = "8930bc1fcb5693689dc35d98ad2a4153662e34b1"; + sha256 = "sha256-kuMNiWpPeqsIsFgYIOsffxUfwcLPaMZWdZRBJAMDVvA="; + }; + } + { + goPackagePath = "github.com/kelvins/sunrisesunset"; + fetch = { + type = "git"; + url = "https://github.com/kelvins/sunrisesunset"; + rev = "39fa1bd816d52927b4cfcab0a1535b17eafe0a3d"; + sha256 = "sha256-awklKAW1YM3sWM21irbyu2sUMIo3kCOj12lzyVzDefw="; + }; + } + { + goPackagePath = "github.com/cryptix/wav"; + fetch = { + type = "git"; + url = "https://github.com/cryptix/wav"; + rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; + sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; + }; + } + { + goPackagePath = "github.com/rickb777/date"; + fetch = { + type = "git"; + url = "https://github.com/rickb777/date"; + rev = "v1.18"; + sha256 = "sha256-8r8eFOF5dKtowE3dnjpSMIXJ/yX2IjiR7nZ/EApUZbA="; + }; + } + { + goPackagePath = "github.com/rickb777/plural"; + fetch = { + type = "git"; + url = "https://github.com/rickb777/plural"; + rev = "v1.4.1"; + sha256 = "sha256-nhN+ApdfUie45L+M2OZAPtSoiIZ1pZ2UpDX/DePS6Yw="; + }; + } + { + goPackagePath = "github.com/gosexy/gettext"; + fetch = { + type = "git"; + url = "https://github.com/gosexy/gettext"; + rev = "v0.9"; + sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi"; + }; + } + { + goPackagePath = "github.com/msteinert/pam"; + fetch = { + type = "git"; + url = "https://github.com/msteinert/pam"; + rev = "v1.0.0"; + sha256 = "sha256-Ji13ckPyZUBAovhK2hRHgf2LB1ieglX/XrIJBxVcsXc="; + }; + } + { + goPackagePath = "github.com/youpy/go-wav"; + fetch = { + type = "git"; + url = "https://github.com/youpy/go-wav"; + rev = "v0.3.2"; + sha256 = "sha256-jNqXW3F3fcgjT47+d2MVXauWkA7+1KfYVu3ZZpRCTkM="; + }; + } + { + goPackagePath = "github.com/zaf/g711"; + fetch = { + type = "git"; + url = "https://github.com/zaf/g711"; + rev = "v1.2"; + sha256 = "sha256-G+0cgGw/fcOUFVn32AeqUE0YjyOS82Z5MTcn6IANhCY="; + }; + } + { + goPackagePath = "github.com/youpy/go-riff"; + fetch = { + type = "git"; + url = "https://github.com/youpy/go-riff"; + rev = "v0.1.0"; + sha256 = "sha256-d/3rkxDeRTPveZblArKc61gB4LJVV08n7g0THieuhx8="; + }; + } + { + goPackagePath = "google.golang.org/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/protocolbuffers/protobuf-go"; + rev = "v1.28.1"; + sha256 = "sha256-7Cg7fByLR9jX3OSCqJfLw5PAHDQi/gopkjtkbobnyWM"; + }; + } + { + goPackagePath = "github.com/mdlayher/netlink"; + fetch = { + type = "git"; + url = "https://github.com/mdlayher/netlink"; + rev = "v1.6.0"; + sha256 = "sha256-3pVOXscdUVerFlRW9aGz7/5YL2OWFkvm8AJGSxygkEs="; + }; + } + { + goPackagePath = "github.com/josharian/native"; + fetch = { + type = "git"; + url = "https://github.com/josharian/native"; + rev = "a938fb150d47536d63d6bb2f0c4433091cb8c223"; + sha256 = "sha256-KYeAFKKzRt+e7Zy0sp4VW65HQL90hF/wjXP3R5dXaww="; + }; + } + { + goPackagePath = "github.com/mdlayher/socket"; + fetch = { + type = "git"; + url = "https://github.com/mdlayher/socket"; + rev = "v0.2.3"; + sha256 = "sha256-EDaSQ621SJ2OK2WycMtybuJ2KpaH86JHknqsiduuCtQ="; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://github.com/golang/net"; + rev = "83b083e8dc8b4507e702ce59208711115b23ec25"; + sha256 = "sha256-50A1EeE7HxKbnLBy1vdxtrbH+7d6/mnZA0cOwHJr5XA="; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://github.com/golang/sync"; + rev = "7fc1605a5dde7535a0fc1770ca44238629ff29ac"; + sha256 = "sha256-5EOxO8FRdaLW9v/DhwBmWiT2G34A2ofxSCaC7ovvpb0="; + }; + } + { + goPackagePath = "github.com/adrg/xdg"; + fetch = { + type = "git"; + url = "https://github.com/adrg/xdg"; + rev = "v0.4.0"; + sha256 = "sha256-zGjkdUQmrVqD6rMO9oDY+TeJCpuqnHyvkPCaXDlac/U="; + }; + } +] From 0150df8d513f97cc85cdff47d025339d580ded20 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 6 Apr 2023 19:40:38 +0200 Subject: [PATCH 029/169] vscode-extensions.devsense.composer-php-code: init at 1.33.12924 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 44fb209b2bea..1a8e31380c39 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -798,6 +798,23 @@ let }; }; + devsense.composer-php-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "composer-php-vscode"; + publisher = "devsense"; + version = "1.33.12924"; + sha256 = "sha256-9Uz8B4qQ57gfETitzRAVEq/Ou/s3jOF/p2EyEDo1jP8="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.composer-php-vscode/changelog"; + description = "A visual studio code extension for full development integration for Composer, the PHP package manager."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=DEVSENSE.composer-php-vscode"; + homepage = "https://github.com/DEVSENSE/phptools-docs"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.drupol ]; + }; + }; + dhall.dhall-lang = buildVscodeMarketplaceExtension { mktplcRef = { name = "dhall-lang"; From ec5d68c93a83bb26b60dd396dd22a66707b1cba5 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 6 Apr 2023 19:41:11 +0200 Subject: [PATCH 030/169] vscode-extensions.devsense.phptools-vscode: init at 1.33.12924 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1a8e31380c39..625ad0b733d9 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -815,6 +815,23 @@ let }; }; + devsense.phptools-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "phptools-vscode"; + publisher = "devsense"; + version = "1.33.12924"; + sha256 = "sha256-ImaGkIe+MTO/utfVh3Giu0+jTSN0mmhgg6LvOod1suE="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.phptools-vscode/changelog"; + description = "A visual studio code extension for full development integration for the PHP language."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=DEVSENSE.phptools-vscode"; + homepage = "https://github.com/DEVSENSE/phptools-docs"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.drupol ]; + }; + }; + dhall.dhall-lang = buildVscodeMarketplaceExtension { mktplcRef = { name = "dhall-lang"; From 0d7295ade22f125bfd5e40687e665bb664a7cfb9 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 6 Apr 2023 19:41:35 +0200 Subject: [PATCH 031/169] vscode-extensions.devsense.profiler-php-vscode: init at 1.33.12924 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 625ad0b733d9..ea64eeacfdc6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -832,6 +832,23 @@ let }; }; + devsense.profiler-php-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "profiler-php-vscode"; + publisher = "devsense"; + version = "1.33.12924"; + sha256 = "sha256-6+spMS+oypq8KFW5vsoy0Cmn7RD5L1JQnHSyJAvYhTk="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.profiler-php-vscode/changelog"; + description = "A visual studio code extension for PHP and XDebug profiling and inspecting."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=DEVSENSE.profiler-php-vscode"; + homepage = "https://github.com/DEVSENSE/phptools-docs"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.drupol ]; + }; + }; + dhall.dhall-lang = buildVscodeMarketplaceExtension { mktplcRef = { name = "dhall-lang"; From 482b61e1423f264279bb321b8d8c93fb766d4927 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 5 Apr 2023 01:27:38 -0700 Subject: [PATCH 032/169] default-crate-overrides.nix: prevent `git fetch` The build.rs script shipped with evdev-sys attempts to detect cross compilation and uses a completely different codepath which does a `git fetch` inside the build script. This doesn't work in nixpkgs. This PR adds a `touch libevdev/.git` to trick the `build.rs` into thinking that it is not necessary to do a `git fetch`. Thanks to @figsoda for finding this more-elegant solution to the problem (my original solution needed to patch `build.rs`): https://github.com/NixOS/nixpkgs/pull/224893#pullrequestreview-1373809617 Tested on: - [x] `aarch64-linux` (cross from `x86_64-linux`) --- pkgs/build-support/rust/default-crate-overrides.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 441c6dfaf9c3..a0e3c8fabea0 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -36,6 +36,9 @@ , alsa-lib , graphene , protobuf +, autoconf +, automake +, libtool , ... }: @@ -85,8 +88,16 @@ in }; evdev-sys = attrs: { - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = + [ pkg-config + python3 autoconf automake libtool # used only if HOST!=TARGET + ]; buildInputs = [ libevdev ]; + + # This prevents libevdev's build.rs from trying to `git fetch` when HOST!=TARGET + prePatch = '' + touch libevdev/.git + ''; }; expat-sys = attrs: { From 579b812b0e0395d10aa55507e2f6c2e0763fb565 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 6 Apr 2023 13:43:22 -0700 Subject: [PATCH 033/169] https://github.com/NixOS/nixpkgs/pull/224893#pullrequestreview-1375521876 --- pkgs/build-support/rust/default-crate-overrides.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index a0e3c8fabea0..ce8217b403e6 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -88,10 +88,11 @@ in }; evdev-sys = attrs: { - nativeBuildInputs = - [ pkg-config - python3 autoconf automake libtool # used only if HOST!=TARGET - ]; + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals (stdenv.buildPlatform.config != stdenv.hostPlatform.config) [ + python3 autoconf automake libtool + ]; buildInputs = [ libevdev ]; # This prevents libevdev's build.rs from trying to `git fetch` when HOST!=TARGET From 9d51da4f53c3a70e9aaed2db30187c1d69426a40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Apr 2023 23:30:25 +0000 Subject: [PATCH 034/169] marwaita-manjaro: 10.3 -> 17.0 --- pkgs/data/themes/marwaita-manjaro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/marwaita-manjaro/default.nix b/pkgs/data/themes/marwaita-manjaro/default.nix index 5cbf4c192085..e00fe5ff2254 100644 --- a/pkgs/data/themes/marwaita-manjaro/default.nix +++ b/pkgs/data/themes/marwaita-manjaro/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita-manjaro"; - version = "10.3"; + version = "17.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0qihxipk7ya6n3p9kg20bk6plnb85pg3ahwd02qq4bqfiw6mx3gw"; + sha256 = "sha256-lNHzO5wxAFL1axLlxefXyJue0Zu6bM53AUNm74IE4y8="; }; buildInputs = [ From 63c7ecbafb6b0679fd5fbdb136f9d9f4d0d976a7 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 7 Apr 2023 08:01:24 +0800 Subject: [PATCH 035/169] traefik: 2.9.9 -> 2.9.10 Diff: https://github.com/traefik/traefik/compare/v2.9.9...v2.9.10 Changelog: https://github.com/traefik/traefik/raw/v2.9.10/CHANGELOG.md --- pkgs/servers/traefik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index c16fe441ff00..1f8bded409f5 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "traefik"; - version = "2.9.9"; + version = "2.9.10"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-p5leV7Eg+BysUw4AWfhPeccc6TPhRV48T9BiDORR7Co="; + sha256 = "sha256-Mrdlu2SdOiMTkBXeStZaex3bVyw7vfidgOeCmhfB5Tc="; stripRoot = false; }; From 3d5b79368ae6fd5a787945f855a691c0acd952cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Apr 2023 00:42:23 +0000 Subject: [PATCH 036/169] goeland: 0.13.0 -> 0.14.0 --- .../applications/networking/feedreaders/goeland/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/goeland/default.nix b/pkgs/applications/networking/feedreaders/goeland/default.nix index 4c82bcdd3168..c750decc30b1 100644 --- a/pkgs/applications/networking/feedreaders/goeland/default.nix +++ b/pkgs/applications/networking/feedreaders/goeland/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "goeland"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "slurdge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MD8wdXOZ8Kmun8AYv/zlRKwgAcGu2A349Xr8d7SVX4s="; + sha256 = "sha256-O4/dKTphgvcL5V66pMk2blXZ1cVsUgazMBaZCoAAwkY="; }; - vendorHash = "sha256-BErLmtzgVqDKLFAnKugDBwj3Vgm8rM6BfWcMOhu4SWY="; + vendorHash = "sha256-jOtIA7+rM/2qObhR61utvmXD+Rxi/+dEvzgYkGR76I8="; ldflags = [ "-s" From 816045aabcc7f60b25970008b34cb1c966febf9d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 7 Apr 2023 04:20:00 +0000 Subject: [PATCH 037/169] millet: 0.8.7 -> 0.8.8 https://github.com/azdavis/millet/releases/tag/v0.8.8 --- .../tools/language-servers/millet/Cargo.lock | 203 +++++++++++++++--- .../tools/language-servers/millet/default.nix | 4 +- 2 files changed, 172 insertions(+), 35 deletions(-) diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index ff5974a8065b..7afa2874b318 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -2,6 +2,21 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + [[package]] name = "aho-corasick" version = "0.7.20" @@ -13,7 +28,7 @@ dependencies = [ [[package]] name = "analysis" -version = "0.1.0" +version = "0.8.8" dependencies = [ "config", "diagnostic", @@ -46,6 +61,31 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "better-panic" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fa9e1d11a268684cbd90ed36370d7577afb6c62d912ddff5c15fc34343e5036" +dependencies = [ + "backtrace", + "console", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -71,7 +111,7 @@ source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb25 [[package]] name = "cm-syntax" -version = "0.1.0" +version = "0.8.8" dependencies = [ "lex-util", "paths", @@ -90,7 +130,7 @@ dependencies = [ [[package]] name = "config" -version = "0.1.0" +version = "0.8.8" dependencies = [ "fast-hash", "serde", @@ -98,12 +138,33 @@ dependencies = [ "str-util", ] +[[package]] +name = "console" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "windows-sys 0.42.0", +] + [[package]] name = "countme" version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + [[package]] name = "crossbeam-channel" version = "0.5.7" @@ -158,6 +219,12 @@ dependencies = [ "log", ] +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + [[package]] name = "env_logger" version = "0.10.0" @@ -179,7 +246,7 @@ checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" dependencies = [ "errno-dragonfly", "libc", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -210,6 +277,16 @@ dependencies = [ "rustc-hash", ] +[[package]] +name = "flate2" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "fmt-util" version = "0.1.0" @@ -233,6 +310,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "gimli" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" + [[package]] name = "glob" version = "0.3.1" @@ -289,7 +372,7 @@ dependencies = [ [[package]] name = "input" -version = "0.1.0" +version = "0.8.8" dependencies = [ "cm-syntax", "config", @@ -319,7 +402,7 @@ checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" dependencies = [ "hermit-abi", "libc", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -331,7 +414,7 @@ dependencies = [ "hermit-abi", "io-lifetimes", "rustix", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -348,7 +431,7 @@ checksum = "1dabfe0d01e15fde0eba33b9de62475c59e681a47ce4ffe0534af2577a3f8524" [[package]] name = "lang-srv" -version = "0.1.0" +version = "0.8.8" dependencies = [ "analysis", "anyhow", @@ -368,9 +451,15 @@ dependencies = [ "text-pos", ] +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + [[package]] name = "lex-util" -version = "0.1.0" +version = "0.8.8" [[package]] name = "libc" @@ -435,30 +524,41 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.1.0" +version = "0.8.8" dependencies = [ "analysis", "config", "diagnostic", "env_logger", "input", + "panic-hook", "paths", "pico-args", ] [[package]] name = "millet-ls" -version = "0.1.0" +version = "0.8.8" dependencies = [ "anyhow", "env_logger", "lang-srv", "log", + "panic-hook", +] + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", ] [[package]] name = "mlb-hir" -version = "0.1.0" +version = "0.8.8" dependencies = [ "fast-hash", "paths", @@ -469,7 +569,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.1.0" +version = "0.8.8" dependencies = [ "config", "diagnostic", @@ -493,7 +593,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.1.0" +version = "0.8.8" dependencies = [ "lex-util", "paths", @@ -533,6 +633,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "object" +version = "0.30.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.17.1" @@ -548,6 +657,13 @@ dependencies = [ "winapi", ] +[[package]] +name = "panic-hook" +version = "0.8.8" +dependencies = [ + "better-panic", +] + [[package]] name = "paths" version = "0.1.0" @@ -650,6 +766,12 @@ dependencies = [ "text-size", ] +[[package]] +name = "rustc-demangle" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" + [[package]] name = "rustc-hash" version = "1.1.0" @@ -667,7 +789,7 @@ dependencies = [ "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -729,7 +851,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.1.0" +version = "0.8.8" dependencies = [ "fast-hash", "str-util", @@ -737,14 +859,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.1.0" +version = "0.8.8" dependencies = [ "sml-syntax", ] [[package]] name = "sml-file-syntax" -version = "0.1.0" +version = "0.8.8" dependencies = [ "config", "elapsed", @@ -758,7 +880,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.1.0" +version = "0.8.8" dependencies = [ "fast-hash", "once_cell", @@ -767,7 +889,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.1.0" +version = "0.8.8" dependencies = [ "la-arena", "num-bigint", @@ -777,7 +899,7 @@ dependencies = [ [[package]] name = "sml-lex" -version = "0.1.0" +version = "0.8.8" dependencies = [ "diagnostic", "lex-util", @@ -791,7 +913,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#07a772374caa2b0e3acda920f7 [[package]] name = "sml-lower" -version = "0.1.0" +version = "0.8.8" dependencies = [ "config", "diagnostic", @@ -806,7 +928,7 @@ dependencies = [ [[package]] name = "sml-naive-fmt" -version = "0.1.0" +version = "0.8.8" dependencies = [ "fast-hash", "sml-comment", @@ -815,11 +937,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.1.0" +version = "0.8.8" [[package]] name = "sml-parse" -version = "0.1.0" +version = "0.8.8" dependencies = [ "diagnostic", "event-parse", @@ -831,14 +953,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.1.0" +version = "0.8.8" dependencies = [ "str-util", ] [[package]] name = "sml-statics" -version = "0.1.0" +version = "0.8.8" dependencies = [ "code-h2-md-map", "config", @@ -862,7 +984,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.1.0" +version = "0.8.8" dependencies = [ "char-name", "code-h2-md-map", @@ -875,7 +997,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.1.0" +version = "0.8.8" dependencies = [ "fast-hash", "sml-hir", @@ -892,7 +1014,7 @@ dependencies = [ [[package]] name = "stack-map" -version = "0.1.0" +version = "0.8.8" dependencies = [ "fast-hash", "str-util", @@ -951,7 +1073,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.1.0" +version = "0.8.8" dependencies = [ "analysis", "cm-syntax", @@ -1152,6 +1274,21 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -1244,11 +1381,11 @@ checksum = "1dbabb1cbd15a1d6d12d9ed6b35cc6777d4af87ab3ba155ea37215f20beab80c" [[package]] name = "xtask" -version = "0.1.0" +version = "0.8.8" dependencies = [ "anyhow", + "flate2", "pico-args", - "xshell", ] [[package]] diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index e1a9dfe2b279..198cce4ecbfd 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-kHw7hyOH/GAFRh0TErFMXU3NBge2AwpJr8oXbtnWCfc="; + hash = "sha256-DdzBIlkwYo/E+S/KTXUzc3Fp1DQDP8qL8+sG/67XQe4="; }; cargoLock = { From 5fd19c2e75fa62d6e4d8f4265f168f17d8107e51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 5 Apr 2023 16:14:18 -0700 Subject: [PATCH 038/169] python310Packages.rapidfuzz: 2.14.0 -> 2.15.0 Diff: https://github.com/maxbachmann/RapidFuzz/compare/refs/tags/v2.14.0...v2.15.0 Changelog: https://github.com/maxbachmann/RapidFuzz/blob/refs/tags/v2.15.0/CHANGELOG.rst --- pkgs/development/python-modules/rapidfuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 5d226835b79f..dc12f9cffe82 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "2.14.0"; + version = "2.15.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-qZfVr1V7YBuMoFiMwRoEVosof6kCSiIb944gXzPn4P0="; + hash = "sha256-GUwWyOgC8C4GhTcZvd9ccJEsRTkaS0i6rRYU286E7GI="; }; nativeBuildInputs = [ From 9c82fd294f2488c59388bd40e95c974723bc6e41 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Fri, 7 Apr 2023 01:08:45 -0400 Subject: [PATCH 039/169] brave: 1.49.128 -> 1.50.114 https://community.brave.com/t/release-channel-1-50-114/480649/1 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 64e2c7d6cb10..7deb802e5b67 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.49.128"; + version = "1.50.114"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-TXAPzhNRupv8R2rKj/mFdubAVjOrnmbdBtmasTnqfyU="; + sha256 = "sha256-aZuNxO4whVRUb4Up0VwyMiI50OumWuCDfzm15ywGdIk="; }; dontConfigure = true; From b4ef4bca0e2ce77f663ac6616c6e450dd1e26ffd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Apr 2023 06:35:46 +0000 Subject: [PATCH 040/169] python310Packages.vallox-websocket-api: 3.1.0 -> 3.2.1 --- .../python-modules/vallox-websocket-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix index 5697ff812994..44392d00b917 100644 --- a/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "3.1.0"; + version = "3.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "vallox_websocket_api"; rev = "refs/tags/${version}"; - hash = "sha256-JbTuBzRSgMTPSgWEEAJGc8R44VLHiMr4qocbBjpJBmk="; + hash = "sha256-KtjyTSD7osIdThq/Ota4oCyeseBHxqaYaL47wiVicsI="; }; nativeBuildInputs = [ From 88e204147e71c00127242f8e1e1690ee29fb064d Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 7 Apr 2023 11:57:10 +0000 Subject: [PATCH 041/169] okteto: 2.13.0 -> 2.14.2 --- pkgs/development/tools/okteto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index f726e0ad6954..d1137c3def38 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.13.0"; + version = "2.14.2"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-0fgxDUCgjYzrWflsoCGe4WRy3C/NO7FmrSw/LJ/NiUE="; + hash = "sha256-2bO6konOAyrCD+t31ZJ2+Ptp26ylY9wr1uArFu9rlnI="; }; - vendorHash = "sha256-d5z6uuUOHUjARIiRTVJmdQ+9VBaercIcUrcgDsN1zCs="; + vendorHash = "sha256-b2qxvP9spXEJVYOq7o0VG2WOxzUchwtLaY97/2IYoV4="; postPatch = '' # Disable some tests that need file system & network access. From ee61271b2f249e1b434f4691cf44a528e7e6ce52 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 7 Apr 2023 12:00:02 +0000 Subject: [PATCH 042/169] gcsfuse: 0.41.12 -> 0.42.3 --- pkgs/tools/filesystems/gcsfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 02fa3de810b2..d1ee2e0588d9 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gcsfuse"; - version = "0.41.12"; + version = "0.42.3"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - hash = "sha256-s28vtcNodc5IL8SnZLTgSQBTPUf0FiIAv3TxZXMDuYE="; + hash = "sha256-011QEWEnQBskn7xvdP6mbWeBIyUy94sF2T44gobiICg="; }; vendorHash = null; From 8ddb5204bc8c3b2eedd5268e392ae2970e0f6498 Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 7 Apr 2023 23:30:39 +0800 Subject: [PATCH 043/169] dfilemanager: unstable-2020-09-04 -> unstable-2021-02-20 --- pkgs/applications/file-managers/dfilemanager/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/file-managers/dfilemanager/default.nix b/pkgs/applications/file-managers/dfilemanager/default.nix index 6a9453eb583a..2c374511af54 100644 --- a/pkgs/applications/file-managers/dfilemanager/default.nix +++ b/pkgs/applications/file-managers/dfilemanager/default.nix @@ -2,13 +2,13 @@ mkDerivation { pname = "dfilemanager"; - version = "unstable-2020-09-04"; + version = "unstable-2021-02-20"; src = fetchFromGitHub { owner = "probonopd"; repo = "dfilemanager"; - rev = "c592d643d76942dc2c2ccb6e4bfdf53f5e805e48"; - sha256 = "7hIgaWjjOck5i4QbeVeQK7yrjK4yDoAZ5qY9RhM5ABY="; + rev = "61179500a92575e05cf9a71d401c388726bfd73d"; + sha256 = "sha256-BHd2dZDVxy82vR6PyXIS5M6zBGJ4bQfOhdBCdOww4kc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 781d5efafc71..da3259d90edd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29484,6 +29484,8 @@ with pkgs; dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; + dfilemanager = libsForQt5.callPackage ../applications/file-managers/dfilemanager { }; + dht = callPackage ../applications/networking/p2p/dht { }; dia = callPackage ../applications/graphics/dia { }; From d0403d923f630b551f29c2f66f2c88378b144868 Mon Sep 17 00:00:00 2001 From: undefined Date: Sat, 8 Apr 2023 00:37:48 +0800 Subject: [PATCH 044/169] hplip: 3.22.6 -> 3.23.3 --- pkgs/misc/drivers/hplip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index b21d2daeb093..66b26753095e 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -14,16 +14,16 @@ let pname = "hplip"; - version = "3.22.6"; + version = "3.23.3"; src = fetchurl { url = "mirror://sourceforge/hplip/${pname}-${version}.tar.gz"; - sha256 = "sha256-J+0NSS/rsLR8ZWI0gg085XOyT/W2Ljv0ssR/goaNa7Q="; + sha256 = "sha256-5CYKmKKx2I0h6CVi3kGaohyVvJ4qzjWDNGqA/SF+B7Y="; }; plugin = fetchurl { url = "https://developers.hp.com/sites/default/files/${pname}-${version}-plugin.run"; - sha256 = "sha256-MSQCPnSXVLrXS1nPIIvlUx0xshbyU0OlpfLOghZMgvs="; + sha256 = "sha256-AyZBiF1B42dGnJeoJLFSCGNK83c86ZAM2uFciuv2H4A="; }; hplipState = substituteAll { From c33e1cf1a19d114ab1611cbacaa6b983fb6cc5ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Apr 2023 19:32:34 +0000 Subject: [PATCH 045/169] python310Packages.pytest-testmon: 1.4.5 -> 2.0.2 --- pkgs/development/python-modules/pytest-testmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index dcdfba7285b5..236fef58c29c 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.4.5"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tarpas"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RHzPLCC33bPEk59rin4CZD3F7fsT1qyRR2HRyDIwszo="; + hash = "sha256-hQJ52CuCBgxGcbbkbqsshh+lcevrgD8Xjde2ErghRKk="; }; nativeBuildInputs = [ From bb29926bc3273f2a1a9083c521b3ff9ee1df20b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Apr 2023 19:57:14 +0000 Subject: [PATCH 046/169] python310Packages.marisa-trie: 0.7.8 -> 0.8.0 --- pkgs/development/python-modules/marisa-trie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index c5cf720844d7..b2510bd0a8fe 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "marisa-trie"; - version = "0.7.8"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - hash = "sha256-ruPeXyg2B0z9gD8crxb2g5DyYu8JzX3H0Oiu6baHhkM="; + hash = "sha256-PQGdF7DX9i1ubXvQUjbYJSYk6hwUC+uL+cbu/zizxwc="; }; nativeBuildInputs = [ From fcc5bc2af4cb45e47ab7fc05d65016754707f4e0 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Fri, 7 Apr 2023 16:41:37 -0400 Subject: [PATCH 047/169] oracle-instantclient: 19.16.0.0.0 -> 21.9.0.0.0 (x86_64-linux) --- .../libraries/oracle-instantclient/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 129874c1dfba..6b3bb5f62310 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -22,13 +22,13 @@ let # determine the version number, there might be different ones per architecture version = { - x86_64-linux = "19.16.0.0.0"; + x86_64-linux = "21.9.0.0.0"; aarch64-linux = "19.10.0.0.0"; x86_64-darwin = "19.3.0.0.0"; }.${stdenv.hostPlatform.system} or throwSystem; directory = { - x86_64-linux = "1916000"; + x86_64-linux = "219000"; aarch64-linux = "191000"; x86_64-darwin = "193000"; }.${stdenv.hostPlatform.system} or throwSystem; @@ -36,11 +36,11 @@ let # hashes per component and architecture hashes = { x86_64-linux = { - basic = "sha256-Sq1rWvbC1YME7EjSYPaP2g+1Xxxkk4ZkGaBmLo2cKcQ="; - sdk = "sha256-yJ8f/Hlq6vZoPxv+dfY4z1E7rWvcqlK+ou0SU0KKlEI="; - sqlplus = "sha256-C44srukpCB9et9UWm59daJmU83zr0HAktnWv7R42Irw="; - tools = "sha256-GP4E1REIoU3lctVYmLsAiwTJEvGRpCmOFlRuZk+A8HE="; - odbc = "sha256-JECxK7Ia1IJtve2goZJdTkvm5NJjqB2rc6k5BXUt3oA="; + basic = "sha256-wiygUvZFYvjp5pndv3b9yTPxe8sC5HZkJ7jZqO1Mss8="; + sdk = "sha256-ehqHV52yLRe8ehrKqpLaN0HnN3zjHU7WrfjtqvQadgY="; + sqlplus = "sha256-tYvoG+7l5jXyTpxFUYZXaHCT0xGDeah78AinJ2qIsE8="; + tools = "sha256-6K2Ni0ZqqpqCrGFrBD06s0QNjNEDtNPrvDQ1U97lTKY="; + odbc = "sha256-yTANMLhaEqm9/ZEVqhEn1Gl8eJukgvqpqdaMRjxWxgs="; }; aarch64-linux = { basic = "sha256-DNntH20BAmo5kOz7uEgW2NXaNfwdvJ8l8oMnp50BOsY="; @@ -143,7 +143,7 @@ stdenv.mkDerivation { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ flokli ]; + maintainers = with maintainers; [ flokli dylanmtaylor ]; hydraPlatforms = [ ]; }; } From da787e098958ba15700fa96c24d2ab84f753f00f Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Fri, 7 Apr 2023 16:56:19 -0400 Subject: [PATCH 048/169] oracle-instantclient: 19.3.0.0.0 -> 19.8.0.0.0 (x86_64-darwin) --- .../libraries/oracle-instantclient/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 6b3bb5f62310..597c461ed00d 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -24,13 +24,13 @@ let version = { x86_64-linux = "21.9.0.0.0"; aarch64-linux = "19.10.0.0.0"; - x86_64-darwin = "19.3.0.0.0"; + x86_64-darwin = "19.8.0.0.0"; }.${stdenv.hostPlatform.system} or throwSystem; directory = { x86_64-linux = "219000"; aarch64-linux = "191000"; - x86_64-darwin = "193000"; + x86_64-darwin = "198000"; }.${stdenv.hostPlatform.system} or throwSystem; # hashes per component and architecture @@ -50,11 +50,11 @@ let odbc = "sha256-T+RIIKzZ9xEg/E72pfs5xqHz2WuIWKx/oRfDrQbw3ms="; }; x86_64-darwin = { - basic = "f4335c1d53e8188a3a8cdfb97494ff87c4d0f481309284cf086dc64080a60abd"; - sdk = "b46b4b87af593f7cfe447cfb903d1ae5073cec34049143ad8cdc9f3e78b23b27"; - sqlplus = "f7565c3cbf898b0a7953fbb0017c5edd9d11d1863781588b7caf3a69937a2e9e"; - tools = "b2bc474f98da13efdbc77fd05f559498cd8c08582c5b9038f6a862215de33f2c"; - odbc = "f91da40684abaa866aa059eb26b1322f2d527670a1937d678404c991eadeb725"; + basic = "sha256-V+1BmPOhDYPNXdwkcsBY1MOwt4Yka66/a7/HORzBIIc="; + sdk = "sha256-D6iuTEQYqmbOh1z5LnKN16ga6vLmjnkm4QK15S/Iukw="; + sqlplus = "sha256-08uoiwoKPZmTxLZLYRVp0UbN827FXdhOukeDUXvTCVk="; + tools = "sha256-1xFFGZapFq9ogGQ6ePSv4PrXl5qOAgRZWAp4mJ5uxdU="; + odbc = "sha256-S6+5P4daK/+nXwoHmOkj4DIkHtwdzO5GOkCCI612bRY="; }; }.${stdenv.hostPlatform.system} or throwSystem; From c8131513026841e21253f65d24a74e699afeef5f Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Fri, 7 Apr 2023 23:34:40 +0200 Subject: [PATCH 049/169] fnott: 1.3.0 -> 1.4.0 Also removes the dot at the end of the description, which should not be there per the style-guides. Signed-off-by: Christoph Heiss --- pkgs/applications/misc/fnott/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index 8c730a2b48b7..5a76ef9028ed 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "fnott"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fnott"; rev = version; - sha256 = "sha256-6NMMU39v8+Ir3rf7kVwBdEOuYnZC1MqtZnim8+0A7wM="; + sha256 = "sha256-cJ7XmnC4x8lhZ+JRqobeQxTTps4Oz95zYdlFtr3KC1A="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://codeberg.org/dnkl/fnott"; - description = "Keyboard driven and lightweight Wayland notification daemon for wlroots-based compositors."; + description = "Keyboard driven and lightweight Wayland notification daemon for wlroots-based compositors"; license = licenses.mit; maintainers = with maintainers; [ polykernel ]; platforms = platforms.linux; From c884e20976968fd747e383549817d1918e9cbc5e Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 5 Apr 2023 02:04:43 +0900 Subject: [PATCH 050/169] syncplay: render natively under Wayland --- pkgs/applications/networking/syncplay/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 6fb58df061fc..5fe82ed28a02 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "0qm3qn4a1nahhs7q81liz514n9blsi107g9s9xfw2i8pzi7v9v0v"; }; - buildInputs = lib.optionals enableGUI [ qt5.qtbase ]; + buildInputs = lib.optionals enableGUI [ qt5.qtwayland ]; propagatedBuildInputs = [ twisted certifi ] ++ twisted.optional-dependencies.tls ++ lib.optional enableGUI pyside2; From b0004e6c970d8f552daddced6f11c352e256b2a1 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 8 Apr 2023 00:29:37 +0200 Subject: [PATCH 051/169] swapspace: add Luflosi as maintainer --- pkgs/tools/admin/swapspace/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/swapspace/default.nix b/pkgs/tools/admin/swapspace/default.nix index a859de996707..4d961a810a40 100644 --- a/pkgs/tools/admin/swapspace/default.nix +++ b/pkgs/tools/admin/swapspace/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Tookmund/Swapspace"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ misuzu ]; + maintainers = with maintainers; [ misuzu Luflosi ]; }; } From 82dd065f7ab665f3cda63bbe9d7c0d308b649d93 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 4 Apr 2023 13:20:32 +0200 Subject: [PATCH 052/169] swapspace: patch paths to binaries and install systemd unit file This will be useful when creating a NixOS module for this program. --- pkgs/tools/admin/swapspace/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/swapspace/default.nix b/pkgs/tools/admin/swapspace/default.nix index 4d961a810a40..49737edf8bf1 100644 --- a/pkgs/tools/admin/swapspace/default.nix +++ b/pkgs/tools/admin/swapspace/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, installShellFiles, util-linux }: stdenv.mkDerivation rec { pname = "swapspace"; @@ -16,8 +16,23 @@ stdenv.mkDerivation rec { installShellFiles ]; + postPatch = '' + substituteInPlace 'swapspace.service' \ + --replace '/usr/local/sbin/' "$out/bin/" + substituteInPlace 'src/support.c' \ + --replace '/sbin/swapon' '${lib.getBin util-linux}/bin/swapon' \ + --replace '/sbin/swapoff' '${lib.getBin util-linux}/bin/swapoff' + substituteInPlace 'src/swaps.c' \ + --replace 'mkswap' '${lib.getBin util-linux}/bin/mkswap' + + # Don't create empty directory $out/var/lib/swapspace + substituteInPlace 'Makefile.am' \ + --replace 'install-data-local:' 'do-not-execute:' + ''; + postInstall = '' installManPage doc/swapspace.8 + install --mode=444 -D 'swapspace.service' "$out/etc/systemd/system/swapspace.service" ''; meta = with lib; { From 6e8cce5440e1df6ac41a0e10077c232a95115638 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Apr 2023 23:01:59 +0000 Subject: [PATCH 053/169] python310Packages.islpy: 2022.2.1 -> 2023.1 --- pkgs/development/python-modules/islpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index aa8b997d57b5..e0667bb5b7dc 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "islpy"; - version = "2022.2.1"; + version = "2023.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "07062ljvznm2dg3r9b3lq98qygxsha8ylxi4zs7hx49l0jw2vbjy"; + sha256 = "sha256-QLkpCBF95OBOzPrBXmlzyhFMfq1bs2+S/8Z5n4oMekg="; }; postConfigure = '' From 9071d06d01ed34c80c97d44de879da93e98512fb Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 7 Apr 2023 19:36:52 -0300 Subject: [PATCH 054/169] abcl: follow up fixes for #223317 Signed-off-by: lucasew --- pkgs/development/compilers/abcl/default.nix | 6 ++++-- pkgs/development/compilers/abcl/update.sh | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index 46b369cce416..94f74e81906e 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -29,9 +29,11 @@ stdenv.mkDerivation rec { runHook postConfigure ''; - buildInputs = [ jre ant jdk jre ]; + buildInputs = [ jre ]; - nativeBuildInputs = [ makeWrapper ]; + # note for the future: + # if you use makeBinaryWrapper, you will trade bash for glibc, the closure will be slightly larger + nativeBuildInputs = [ makeWrapper ant jdk ]; buildPhase = '' runHook preBuild diff --git a/pkgs/development/compilers/abcl/update.sh b/pkgs/development/compilers/abcl/update.sh index e3f05b8a394b..a8b38e776f25 100755 --- a/pkgs/development/compilers/abcl/update.sh +++ b/pkgs/development/compilers/abcl/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update curl +#!nix-shell -i bash -p nix-update subversion -new_version=$(curl https://armedbear.common-lisp.dev/ | grep abcl-src | sed 's;[^>]*>abcl-src-\(.*\).tar[^$]*;\1;' | head -n 1) +new_version=$(svn ls https://abcl.org/svn/tags | tail -1 | tr -d /) nix-update abcl --version "$new_version" From a0883661e66917c2f7010f2d6481b84e98d4e2b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Apr 2023 02:34:03 +0000 Subject: [PATCH 055/169] python310Packages.pytorch-metric-learning: 2.0.1 -> 2.1.0 --- .../python-modules/pytorch-metric-learning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index bf4f2c2df32a..ae21c5593589 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "2.0.1"; + version = "2.1.0"; disabled = isPy27; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zB0g6GJcqWRhjJZgUWmTdG4fhBBfFR6yEM2FEOVLWIs="; + hash = "sha256-9MIwNsiuWobgBaD2kXHz5nwBy04dxmxpF+7qfZ2l77M="; }; propagatedBuildInputs = [ From 7b3729c4c07bef3f14c4b67dce33e9004fc08a36 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 8 Apr 2023 11:07:16 +0800 Subject: [PATCH 056/169] libkrunfw: 3.10.0 -> 3.11.0 Diff: https://github.com/containers/libkrunfw/compare/v3.10.0...v3.11.0 --- pkgs/development/libraries/libkrunfw/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix index 83f62cdb381d..3b4bf0855d0f 100644 --- a/pkgs/development/libraries/libkrunfw/default.nix +++ b/pkgs/development/libraries/libkrunfw/default.nix @@ -13,21 +13,21 @@ assert sevVariant -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "libkrunfw"; - version = "3.10.0"; + version = "3.11.0"; src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-yL5D8oOGucLWi4kFPxan5Gq+jIkVSDOW/v1+zKg3G+o="; + hash = "sha256-p5z3Dc7o/Ja3K0VlOWIPc0qOIU5p+JSxWe7QiVQNkjs="; } else fetchurl { url = "https://github.com/containers/libkrunfw/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; - hash = "sha256-Q7n+Og+eAnHSQm7kLUN0uV+CKcdtLBYAgt7Q0+CxEfA="; + hash = "sha256-XcdsK8L5NwMgelSMhE2YKYxaAin/3p/+GrljGGZpK5Y="; }; kernelSrc = fetchurl { - url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.1.tar.xz"; - hash = "sha256-L8wH4ckOpM4Uj1D5vusNygtuSzeado3oq8ekom8lJTQ="; + url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.9.tar.xz"; + hash = "sha256-kDRJwWTAPw50KqzJIOGFY1heB6KMbLeeD9bDZpX9Q/U="; }; preBuild = '' From e3d10e25e7fb794cf8db65fe1ae9de06b4796c93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Apr 2023 03:31:47 +0000 Subject: [PATCH 057/169] python310Packages.file-read-backwards: 2.0.0 -> 3.0.0 --- .../python-modules/file-read-backwards/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/file-read-backwards/default.nix b/pkgs/development/python-modules/file-read-backwards/default.nix index 6b39bda1e522..f83963e1e5ae 100644 --- a/pkgs/development/python-modules/file-read-backwards/default.nix +++ b/pkgs/development/python-modules/file-read-backwards/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "file-read-backwards"; - version = "2.0.0"; + version = "3.0.0"; src = fetchPypi { pname = "file_read_backwards"; inherit version; - sha256 = "fd50d9089b412147ea3c6027e2ad905f977002db2918cf315d64eed23d6d6eb8"; + sha256 = "sha256-USw+U0BDUnqPrioLcVGqJV8towPnf9QPfc9CoeCRzCY="; }; nativeCheckInputs = [ mock ]; From 34763f48370a3e46db2c0b1bdd8179c4de8f3ba9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Apr 2023 06:06:12 +0000 Subject: [PATCH 058/169] python310Packages.srt: 3.5.2 -> 3.5.3 --- pkgs/development/python-modules/srt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/srt/default.nix b/pkgs/development/python-modules/srt/default.nix index 1e91aad7b16d..62d03be0b177 100644 --- a/pkgs/development/python-modules/srt/default.nix +++ b/pkgs/development/python-modules/srt/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "srt"; - version = "3.5.2"; + version = "3.5.3"; disabled = pythonOlder "2.7"; src = fetchPypi { inherit pname version; - sha256 = "7aa4ad5ce4126d3f53b3e7bc4edaa86653d0378bf1c0b1ab8c59f5ab41384450"; + sha256 = "sha256-SIQxUEOk8HQP0fh47WyqN2rAbXDhNfMGptxEYy7tDMA="; }; nativeCheckInputs = [ From b8858b7f78077f9c2c44264341f876ebf7c5380a Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Wed, 15 Mar 2023 20:52:43 -0700 Subject: [PATCH 059/169] dotnet-sdk_8: 8.0.100-preview.1.23115.2 -> 8.0.100-preview.2.23157.25 --- .../compilers/dotnet/versions/8.0.nix | 266 +++++++++--------- 1 file changed, 133 insertions(+), 133 deletions(-) diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix index afd4186045b2..bc10ed73b0ff 100644 --- a/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -3,176 +3,176 @@ # v8.0 (preview) { aspnetcore_8_0 = buildAspNetCore { - version = "8.0.0-preview.1.23112.2"; + version = "8.0.0-preview.2.23153.2"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/bcd36740-4478-4104-aad3-97de2eda3c63/4278c479d008a08a82e6ed799ea4cab6/aspnetcore-runtime-8.0.0-preview.1.23112.2-linux-x64.tar.gz"; - sha512 = "8d7a5fbbd62078d55cd93dadb346e8889b5cf4a7337f864839d2ca32283d592d037b89cb0c9940df4cdd956b527fcd3ce5fe608ef7b77dc9ab6d04390e053495"; + url = "https://download.visualstudio.microsoft.com/download/pr/930d8abc-009c-47c8-97cc-4c61ca7a74ef/7a116b9554c6db0d84f53937f89d5240/aspnetcore-runtime-8.0.0-preview.2.23153.2-linux-x64.tar.gz"; + sha512 = "1752ce53c8dbc59b3a321da7d44862410bdf29153124099106ec7397ab1fc650aa902849e198da38e5360f7ea5cd3e3f12cf78a9ec8121b666bf1db2080fd7fc"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/63cbd12f-0328-4828-878c-4970ebe2561d/3b0e89d0e68beb6d09ad2323d64d039c/aspnetcore-runtime-8.0.0-preview.1.23112.2-linux-arm64.tar.gz"; - sha512 = "b8f5eb4087267f84bbea48f7c98f53d09cffdf269792c713c9d02b892ebc1eea075a39af7fc3cc63348ee6adc54179a5145b884fdf5d8853b7018c800073a10e"; + url = "https://download.visualstudio.microsoft.com/download/pr/87c69e56-17b4-4346-995d-14242e2ec5bb/b656ba5e42d9d96ba065a4d0f971590b/aspnetcore-runtime-8.0.0-preview.2.23153.2-linux-arm64.tar.gz"; + sha512 = "4109b7841aa022b777b0f2ec4191ba0773736b5b4411402a1de6d14a63d273a9114e897c7ea38d3ca0bb48de20b165712aba838a6beacf1c31885f1fce0bb2a3"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/60354a8c-773b-4999-af88-f6232bf5b644/19f1f472670e5625ee6a75d09b95653b/aspnetcore-runtime-8.0.0-preview.1.23112.2-osx-x64.tar.gz"; - sha512 = "8fa6786adfcab090872ade64b742af43d75d973d6800ed5be171ba16324dcff7957e52582136116c1e2708e64c08141d4e095088841146d8e651f1f496757d19"; + url = "https://download.visualstudio.microsoft.com/download/pr/8bf4989d-9696-45f8-af31-afd2a7fc5ca9/0892caa5dcc0ee2b342d85963610fe15/aspnetcore-runtime-8.0.0-preview.2.23153.2-osx-x64.tar.gz"; + sha512 = "e711051b2fc7593ce099b200cbe92e56a09e795afefc983f4e3acbbf90019e0b209c5c2a44ae3e3d8228a8c7fbdbaa5e3463ae4dfd7017a6d265537ade01d7f4"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/00e1ec5d-62c0-4084-bf5d-f5667a77afe5/f4d1ceeb2d51a60323084ef43317b1f2/aspnetcore-runtime-8.0.0-preview.1.23112.2-osx-arm64.tar.gz"; - sha512 = "f816c7a078a6d121e74108a9199dfa235ec27e47222e2d25573f8d417560526d9c1e7792a0efe21e0a65e7db07bdbda942b33e38b656d32e9d00d250d7013092"; + url = "https://download.visualstudio.microsoft.com/download/pr/af525c46-4f32-4fb6-9435-522cb5f6b8e5/2323948790b195eebccfa5121d434e74/aspnetcore-runtime-8.0.0-preview.2.23153.2-osx-arm64.tar.gz"; + sha512 = "62358024b8960412f9e457e2dba14f65e03a50557bd6cf23a6bd77de87539d6b93dec55b375375f1ae7ca88de16118d3dca9d72f0a82a31fb3dab0c8e33bbf08"; }; }; }; runtime_8_0 = buildNetRuntime { - version = "8.0.0-preview.1.23110.8"; + version = "8.0.0-preview.2.23128.3"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6c535b62-2132-4f07-90d0-2b172d18e436/b4b8aa2b558e1472c650a40707f25241/dotnet-runtime-8.0.0-preview.1.23110.8-linux-x64.tar.gz"; - sha512 = "76436051d57d602e7d45055c64f5ef4db9a3af3358f880115442b3d7bdcd2a4eaad36c59d51d8508049418d9f62a3f7c0747d989d7d758bd84244806a6f83b02"; + url = "https://download.visualstudio.microsoft.com/download/pr/f74940ab-c6c8-4464-8a4d-a1149a9dc965/c774b22355f65c13101937cbd2a79071/dotnet-runtime-8.0.0-preview.2.23128.3-linux-x64.tar.gz"; + sha512 = "b24bbea7fd0f1d5ca57544ccc690c05496667f30b0804b93a8baaea5e0d201bc471357e0ffac8a4fa5c399d3827942c7f6beb0e3a022e8d0d8cc7ba0ae86a379"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/29109381-5068-4e80-a3f8-d0c825202bbc/b4205a8a483c639c0cfdf54bb1fb5ec6/dotnet-runtime-8.0.0-preview.1.23110.8-linux-arm64.tar.gz"; - sha512 = "2a15a8affb01c905e9ab4989f58a36bf9fec4e7395e3c44f143657e7d2e3903d7469ddc06c3fd57d3fcf48db4713d2ecd2c8ad2b3e361e8138e1890ba81adf73"; + url = "https://download.visualstudio.microsoft.com/download/pr/31b60621-dcaf-4b89-83c6-cd9cc5657350/6a5b181b84409a029d80acc94c0387b5/dotnet-runtime-8.0.0-preview.2.23128.3-linux-arm64.tar.gz"; + sha512 = "48a80c18754e46a12fb04e280cb23e8f9238603aeb0a91125a583eac27a7abb1b20d08b3121444085e4d2034380849dcda88ed69ecc5c4af7e8e3c38a3392921"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/02916946-04e0-45d1-b36d-07ebc9bab6c2/c160d7f42df423bd40d7251ee015b440/dotnet-runtime-8.0.0-preview.1.23110.8-osx-x64.tar.gz"; - sha512 = "c07754ca2067f38a37b2e4f35eea1dd8a82757906ae21964a21d2c2eabddfb80cb309a2267e619b6bb2447b917d8b47948c7835063200efded1fa35f89edb4d9"; + url = "https://download.visualstudio.microsoft.com/download/pr/79a747b1-a7b8-432f-a641-fdc528f4d885/242cab0619683336965c964038e57ff7/dotnet-runtime-8.0.0-preview.2.23128.3-osx-x64.tar.gz"; + sha512 = "eb5f6eac1211e5c0398882d4f5e1859b5e2439e0564da4fdd4c8b3a4a60d360a4b9b48c06bc048badcc2d6a2b539ee740f85ae6e7ab03bed40ba9574655fe044"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/13005a07-288f-4c55-b874-71a336d4c687/ba476df7f39fd64214b1911ac4791c97/dotnet-runtime-8.0.0-preview.1.23110.8-osx-arm64.tar.gz"; - sha512 = "415ff6cc4cffc0cb25b92a88cd12f4653d087247b6e81b2e3d2f49b25363301ab239ef82d0d174f7dd7b31989ecfa8b6ed4dbf5e37d659fee864bcc22df0a908"; + url = "https://download.visualstudio.microsoft.com/download/pr/6651d249-9e3a-4726-9733-76307787c213/445ad516907a2939a3da383501e51cfe/dotnet-runtime-8.0.0-preview.2.23128.3-osx-arm64.tar.gz"; + sha512 = "d6dc11b7e5cea5e96e45a401027a2f3e498e41658b3a1862cddec009a96eea83cb929338e402960e150fb3f77da582f1416d0f5231d6beadfd32a443ad68e9da"; }; }; }; sdk_8_0 = buildNetSdk { - version = "8.0.100-preview.1.23115.2"; + version = "8.0.100-preview.2.23157.25"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e2578737-231b-493c-a6ee-f181496fe679/18038808d2621094ebe172ca011a7c22/dotnet-sdk-8.0.100-preview.1.23115.2-linux-x64.tar.gz"; - sha512 = "23a14c92e402161ed8d42ec9cb25a97868a1b72348195d28cffa00a12815f019308b56485e4375c0d0a33d9a683d83cc1e1a2a517eea44af8fb353171b6c3f64"; + url = "https://download.visualstudio.microsoft.com/download/pr/a042ab5b-f160-4621-ac14-77be759167d7/373e6e8ae9381ffc1ba853bb6542d55c/dotnet-sdk-8.0.100-preview.2.23157.25-linux-x64.tar.gz"; + sha512 = "97302c3600af7787fb136b226ca7e2a0a22241aa93dcffc70010b475bf6f8c4ff74a363d94949e1b64a91032b57a58a7065d7c6b2177696d8e78504ef4f1280f"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/57c316ef-4b1d-4b1e-b180-f38302132d3d/b938e1b373897fadfb25ff4b55ca32e6/dotnet-sdk-8.0.100-preview.1.23115.2-linux-arm64.tar.gz"; - sha512 = "98518887927605051312554499e197c14b32e8100fe8d8015a4556fdca3a347a3d2215d14069d33b27d978489f3e958c11baf18ba33e1b98580d2eb64cc1097b"; + url = "https://download.visualstudio.microsoft.com/download/pr/5ca09c3e-e6c0-4ea2-bc1c-371cc4d0b79a/f05e4e38788662b2e226bf75569e42aa/dotnet-sdk-8.0.100-preview.2.23157.25-linux-arm64.tar.gz"; + sha512 = "440919e2c0d3e0bfb387e2d0539b39045c6581a41f0237c88566d3642ab2c5e4a8e540f3d9d514997bb4a17b19c64a46b80f38af5f66705da1349373f87448ea"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0b01073d-3861-4fe0-abba-41e271c79725/12150bdbeeeb50e157b91f2adab90c80/dotnet-sdk-8.0.100-preview.1.23115.2-osx-x64.tar.gz"; - sha512 = "fb67f43a8a4e56d6121fadb2e2a8a24157d9cee3ba1b0e0bbeb2997f0574f97a525d22bd40ceee026ae782512d9ef88ced892d94af852681399e7e320c1d642b"; + url = "https://download.visualstudio.microsoft.com/download/pr/6a390a1a-2d50-4ea3-a5f7-0a945b30a436/1968bbba00d7c4a3d2f0b8d13002d77e/dotnet-sdk-8.0.100-preview.2.23157.25-osx-x64.tar.gz"; + sha512 = "f3c4bd87d15a0593895121993326adef55641b59682ef52f6ff5fd44505468784590cf5fada9ea531377389ee47202db89de0520cdbbd497f85f5717fb74879b"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/00476255-fac3-4e26-98a4-c487aa89945c/76550e8fb59f35fcb6b789d570b9ace5/dotnet-sdk-8.0.100-preview.1.23115.2-osx-arm64.tar.gz"; - sha512 = "51164fa4a7353d36bf83126e8a2875152ef55b3d0641d61d143a3572c0e169e9e6026e924209d7b9cca93475b8b9fd6e476f733b1d21944e942f67a43f319aea"; + url = "https://download.visualstudio.microsoft.com/download/pr/62c49e14-4f0a-4698-aa08-8d77d383fa8f/909bb059d035324ddc2e8a8fdb77a01e/dotnet-sdk-8.0.100-preview.2.23157.25-osx-arm64.tar.gz"; + sha512 = "3b5c169180538a13c3199de0df096a2a84f58d2b55bc0dc94be374a015a231c035e57fa62e160e9c5595c6fcf92926ae9c577c6d62cf17803d931e5e90b5e694"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.0-preview.1.23112.2"; sha256 = "1lbzvxjm9mhbwygvn6rfbih2gsaapb33c9bkr48812jz0n1nj4kk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0-preview.1.23112.2"; sha256 = "0p99wvlr0mpg5600ajcmsxhqcazk1m95vivjrw691a7sqbqibrq6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-preview.1.23112.2"; sha256 = "07j3asxynyby94qi3ky1yqcmakjd06fyq9354r6mkckn30i4ncs5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.0-preview.1.23112.2"; sha256 = "0d3qxg43wz7g5kas3c2mr9hcxzm5bw8cm0q4jv17wzwzwkk4jnfy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0-preview.1.23112.2"; sha256 = "0il697pzhd5ikfc76695i3621bhl469cg0hz50j061bsb06q4dqi"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0-preview.1.23112.2"; sha256 = "195qsdbrzv3llb5yq0dfwx3iqiyw7v6f8idwibj43347j4pdi6w9"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "8.0.0-preview.1.23112.2"; sha256 = "1jrc4fjydzqj4ksa0hr51ic4xp1ifrsq2liy1sjzsvvkyifbz9f8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.0-preview.1.23112.2"; sha256 = "1b0f760q94x33x4masnz9v643adrdqc5xf8cliphd4g3awspkszf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.0-preview.1.23112.2"; sha256 = "0vxndnbgyvjminvssx0qlwiqyapsy7fsjyh8ndkf3g5brvr4id2n"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.0-preview.1.23112.2"; sha256 = "0li0x59gdzgip7fwkbvcfr4vw9h8hkfh96jpj8wnk66jbmyk6phk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.0-preview.1.23112.2"; sha256 = "1r5z6h6c9w1xw4d5fvqplsr2j6k1bkw8kp2a7zkxya0f185g1abl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.0-preview.1.23112.2"; sha256 = "1317rfzgc1znrzqjk31ykrnzcpw8835y7vsrxi19fk6m6a2ylx4s"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0-preview.1.23112.2"; sha256 = "1l5vh6qz4y31l3mxa7isv6pbhaqfd9j23493c8wci1adqg2lhgfv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "09f8ckxyw8mpvypzifk3rmcays4jzypbz61gznvhkk1mxfh47hia"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1d433w5750sf540w2nf4m926yw3mciml4z5w1wiyw4fgq3z329d5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "17dla35fn05rn2svkap5j2j6579i3sgarama3ma2s0zsd3qbppbw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1qc8h53yyyryfx9c9wj5zzjm47g4xc57wjrcq4ddr6dbw9spyq7i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "0adzrwsccm8wl666haxybrs2x3qm86mjl0ql18sz67gxpdx1lbf2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "13m9gzs0dy8nr7k8ha82h04491c932z45lf02xpdw7f30p8wd111"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "13wnc79f0kjhq6g5024v2vjn3cc0618117vz9bwbkfpy6bnsz1ny"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1p5jws2bdj5swy7r8z32swzn9c0h2mrwalhd3q9f7n8mgqqr9g5n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "08w4mkak0kabbaqv9vw2hy65qmz5967z73cmd901l9sr5gr8k9i0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.0-preview.1.23110.8"; sha256 = "1vshh5crb100kqpis3qxjffp09mkcha20yps4czl0aqy6rv7nacf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "0vwx782gmcgmzid0pync6xwyg4ribcq4yawpssd0jldmy7kr8zvg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1r5f67l3jhiw7hyfawm680aag3wlhqx79rarlbgqmh1gs4z3z2ds"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "04y6rks7j3mizg1y5ykdgl8kczl31zr99kn15z1z7ymajldxga4a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1f7hklh9vkzxnr81k1i5rhjwn5q9bi4a7gf5lz6lrjg8w97fh1fy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "009l5ykx91zy9inrr0xmqqgjgxj9gr20350j1gzv8n0hwd73n3s1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "0jllhxnmpmbspk6p9mwnlac1f0pw42vxy4vgc4dm8y4d8mqpbp9p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "0vnwx5607gwnjnzs89c48202jiysb92kby0s7jfv5lvb0r1naacb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "08mxpbzdpdj99w3a0mbvb2873kd7gf36w76d6qrix1zcpf4chfih"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "0kx86mr5jss54a51iyky4x1j7jy6zmac50yr9hdmzkgg4ilqz82w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.0-preview.1.23110.8"; sha256 = "12ll7kdgc2v1270lww2ylcrlapzrwr2nbd2jx2wjgsb1q13asas0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1s5z4p505z9ymf41s247w2f3xy3p433sf8g6a01anmkhyrja0shy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0x0z37702vw2wwhypjvdfxxrdxyhykv30npm3q9w68d00w7kdaj3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "1lwdndszklk7m2pmj9b9s1k2h9cp3a8hsas0nq6kypmpwh473asj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "0zmxs0v0r92g3f3680fp4mryi74mza85yknzcg2ygvasw1zq57db"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1d2xvd54lgfsipv5gpakv8r5qvqhxg47k89qbr62f11clqjp1pbl"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0bc702a48wpbfya6ffaz3jnzl1b01q915v9aqd07h2km57mimyc8"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "1i6l87iqkg4695cbsfchzv74smag9wi5xfz6854k7pqhfx0bmmnn"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1ysiwq6z3xz9b0n8prvgd5a5bwdyl86fcan6fy7h2zj3crbc5hnh"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "14xnzkimq1pf7qcm8dlcwszcx00yy39im064yxj46bak9md0ppfz"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "006f41nqrbq2wh6qfik71pf2zqknmckk8g6pf4hbnckp95jlb9zj"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "0kd96jcwmpjb0cvpdaj88rnv99vdb4p0fmy05khq0jk1qyxm4h9i"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "0qlm6p4s49w7v911pia35h6dh3ljl0yk8gavb0ij9xmy8zkrjxsk"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "10vrhk52f87q98ixmy642avj5b47dhgnhgd9z0mv063xx31f7z4h"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0hid6jpg4q1xl5lf0a65pj1x4dn4zvim4j4pyhgsshb0pqj9kzhy"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "19rylmrajxcmjpfijgmn64z2v935d4rmq9vnm0187a1h9kyvqz9l"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1a3ckzz5l92hr6rhdv942w16654dldcv8s4g3hiv2snd3ra1qdal"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "06ykyfmj6q65fn5xx6hgr8g83k4pwv118rs02wi5sl2xgl37w60s"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "00ikv949xhyd50ndv58inblggjdzphcky8w9nf84pyiw9vpfgaxr"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "1h7qkd30q588lmkr7yw68xmm9cipiwbi7lyardcc7kkqr7v3m2r0"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "14kclfm2cg55j94nynrqdy3nby98051lvh5jl0r6aw06380g6z3h"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1p9p8anr605fmrqzll2qlrryb060lkijnsw6w7rarh724jcx6van"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1gl523fpl5446h8hds2w38lr05x41fnggkb26d92wrl4av3ymmhm"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "0y8gsgzx44zyw5ixacm5sisqmclgvf7qi1dgflfd33mpylzskway"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "0534xd1n557s09n1bf88ninp7r6cdj4d27dk1ls6bwq9a1f7wz11"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1mlcgfxpl7n8p968qxs92mis7yvwcf8zv6ypgj7h3gpzxk7mpyb9"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0hkxz60p0byc10qi3kmhzfgwr5a94y64z5ijagas0s829y3xg15w"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "1blcg6isbcbb0vv1misnhgp8005d4kjs1rpjmssv5r7abvz077wq"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1afsc9a1drr7i1blqcgaphggjpkyfj6amc5wrw8r7q3sx6ix3m9l"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0mpr88cfi1cqlw0asf43jrh4g5j8brz7bmv5ggzjjskq5s4ijyrz"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "07d3mxprv0szcvj2s0fynzbzhx67iamjdil69cavkwx5lkry07s5"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "00iz16i9kdmjg8wax6w6ybm810xi6593rkixawpszjqhiifwd4vh"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "0gxpywgcda1z82r8xzcw4xsynlc330r4ms9bnfdm5iq8xbdafkbh"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0aklxhf1kfn6rk9ifapkrrviamrdr2nvsjniwgz02ihms7d38maz"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "12k9flpf571xz14jg47mra12ssv6s4nscafb3zivlhw949bpz4sd"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "0p67vwnhczfz6p8vx1llybwkp9wvvk5piiw9pzwy2qi71913l2nz"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1szg1rgyyj0c1fsnyf0xv5m7c2dp9qs13pdaa0r8l0g2nc79wd59"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "03jwqgr2x9lliz4f96bdbc6h1z02dgq037qhjn48s7a9khp3ky77"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "144sxccrc0m5wwp192csa3byyhbn0s40d6gysh9z1da680m6rmvq"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "01i9lifhxsali51j4p7ip9jnpdl30cgx8j0w6ib7l4bq0719s5pm"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1rwn1c22a14fkb5wlap81p0amaa2s19z9xb44zwk844vyfyia9iv"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0gnhcx2avlr4cvxfnz0rwbdbg7sxpvkn1rq7ff6a8gp9wf9xngp5"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0b0wc36adbfc31wc2lcwbzlb056pj8x9zcp8h1iikpc1fpxn0dyh"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "0ahn58gm3031yy9glhdph0chpixxpjykbgjzk2nxi65b6knvn9lv"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "063rf8bc5200vzcdig2pm1qb5y9ihnn35dyv2ws2k487v54mchh5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "8.0.0-preview.1.23110.8"; sha256 = "176gkl0hwgiw6dj5j10gaqi7sra2qshhfsrksh2zrr2askrynkyj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "1jrmf89v3596gfv2ihfaahx144yaxy31zy4h6mz7g1d3si18i5d1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "0j01372ydb1w1jqydyds175cgcj4gnhwv1swzcbxl6ljp8zpjw0l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "1vwfp4xwgbffzihx2sxqwq2ywrd5xrnj9djgchmcscssgix8p6k1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "094q704n6np5hiqc75p24frqrzw155194128bhs1frhq4qbyfwxh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.0-preview.1.23110.8"; sha256 = "1zzjs4wi9i06kfv301ib5pgi631w0ssv1sw5vawk6j20aks098mr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "1jdbr2425mvyqcycd257hr75r9b5jfm8g2n8ycdily7viagk37wm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "03yzv12bxlix9dag8ik3smxbk9fxyw9agnwdqa68dlacqi515w4r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1dqzg08wililm03qx760cjq56d2q340vsrqk5r5i8y3dvzzbmpb9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "18pi9ih1jx2fwkvx6smw1vlcyky2cj981v1fnav983ywz5cm1l5y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "0msgs5dvjqcaz59dx4l0fxdfs48vab6nypimq4q8q4az52r6pikl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1inn16z3ms723lanc323b0zbvn0kygh67hyi6y9afvn5l6wjb29j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1h8ijydxk6qby92vcbj7im1vwsyi7xwcmck7p6iqxmfph06kl02p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.0-preview.1.23110.8"; sha256 = "11lr9a44m9mxrwr5d8yrhv6pjp11lycd1z8jarx553vjnilqaryr"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "00nki84qrr7nmgvm93ivclj5jmxbnp3i0461s03yi7hcc459qhmz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "00k4g5nah2dc7iwcd422i793mrkg02fz09yig3kqy1z8q3b5m2ln"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "0lgkamn3x004wkq0ijqsw0rdfrkwb68kg6wf8lg9fssikp6r75c2"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "05c7cxrg2191v8lnbsg0ygj5qc4mj5x9x6088v9m039wbswc4ggc"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0p2aqc921666d35hgwc45kn6qxh1qn28jq7ca0pql4v8778pxkln"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1wcw6rzqcdvc14p87d5ip4l9hlnf5cm52sqklakgnv15k9a00i7i"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "1qddlbadxfk3jmbm41gry0d4nl8rm6rgb58cya3qvwrp4rizxi5s"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1ryndj04m867fdfn8jvkahkm5mq3bp3z4b4skpf6skq9w994fksk"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "1p798z08kyw2mnpps9z8f1q7mj76p1phqrikhxh99l12cdcv69z9"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "0bfw4wmwjijm7aimf1zf51ghhxabp4ag27x1sgjx9vbysi0g9fjd"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "055snp02x9v4s8kqhyrcmasz0dsjw2mp2wsfyfnyjvyj1nrr47ii"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "0w2wciixif3j8l210jvdlk92hxmhzydwy7si8g9509a848s3rppc"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "162gb1a7g3y7prcp6k40bj0z7jvs6hhsx063i1m1w8a07ng65mpy"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "107sh6dmzpv2jign21r50pg68qq7n8iyrd2ia159p3rlchc6w3qv"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "1vgahyzblbvgjfl3dcxhd1d2f1jz7bk9vc7k8bi28sh4hm9xq1av"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.0-preview.2.23153.2"; sha256 = "05d2vh8n184j2l2s187licqpmqfls21nvhrd41gqlg3ryzvax5ck"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0-preview.2.23153.2"; sha256 = "1096asgigq2i1wki233g13yf79m81v9w5zb8ga6d31b0fcgjcmma"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-preview.2.23153.2"; sha256 = "0l1nwkiz33qk9jfz76w8mx9i97bwbwngml0wp2288g2zbn6pcp46"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.0-preview.2.23153.2"; sha256 = "0inamjvmvrb5psir94c96491jf1j28pm4i545zclbzgi3xfrhg9p"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0-preview.2.23153.2"; sha256 = "0aghdx9psal6lqdyl60a5yg7x85wswdkbnr1fkgdypxpw99ry0ll"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0-preview.2.23153.2"; sha256 = "136w94lkjv46hhjabvmbkswghbk3bjfrzf6m30kgawcmkkiisd74"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "8.0.0-preview.2.23153.2"; sha256 = "0svsdlca2ib81s2vqinl2bjxvmmigrvdiz6zs52nbl17smz800p1"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.0-preview.2.23153.2"; sha256 = "1659z9mc0y32bf1s22s212ndp0qz82zjm2ljlgqvyp1c6chnjrg5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.0-preview.2.23153.2"; sha256 = "1ycj8saylma1zv734qva0kq14w6rqsay8w8nin17mc3yl4xl0j4z"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.0-preview.2.23153.2"; sha256 = "0zgvfh6k856x0mipwb7q6siz9cy7jfm05jrkgjw11jg6m5ci1kyv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.0-preview.2.23153.2"; sha256 = "0z4w107njs0z8jmr4m7m8jqk8f4q4zc9cfqib2rfs0ph4cjf3jbj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.0-preview.2.23153.2"; sha256 = "0yxk7xnv1n9wmj381a17fdkpz00kwp2hwmpbik6r999f34qnd4dq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0-preview.2.23153.2"; sha256 = "0g6ir33dxn8xvfcmr6ghir9zypxgpkhmsdvmp5ddpfv661jxzmc1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.0-preview.2.23128.3"; sha256 = "1d3r9n8s3hadjkwpb98racv7ddjcwyjgwkfdgk0jqj6j47qm92qm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.0-preview.2.23128.3"; sha256 = "1sfn7y6c5ghrr4hqvisaw4y9kzx1lqdbn0kz2d4gg4lpr757wgim"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.0-preview.2.23128.3"; sha256 = "1xq95d618m0lymn91bxgly0zvgjxl7788zvv1n9h2x7lc46rpl9i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.0-preview.2.23128.3"; sha256 = "163xklskw2sa8g6hnyyswrvc62bzm8xwdscv8z9b2a6r8hmfrvwg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.0-preview.2.23128.3"; sha256 = "1mysvd9wy3cgr0xvici3nfk7h8rcwcd9as4y53igivfilcb5fxml"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.0-preview.2.23128.3"; sha256 = "1wp81n16hzs989p1vlzvv37jq3nmmja0b8ca7lyw0agd1hyswcq4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "8.0.0-preview.2.23128.3"; sha256 = "0ksyx04f4npgs1qg1m63k0ghgkdpqml3ksk5hr2ai4rs7ygxhrgl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.0-preview.2.23128.3"; sha256 = "1ai5lm1ad9qfyfdbiazdcag4bhl450x3iivpgdshs01nmx2i562i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.0-preview.2.23128.3"; sha256 = "1bw78ff4r24qi6s7dbm0a2k664fibz4vlmagb6jhnsp8bn2nmv09"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.0-preview.2.23128.3"; sha256 = "14vg6k2w1cdajciyf9ki6ksarrv2chini495lklnp6kfxxsp2by4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.0-preview.2.23128.3"; sha256 = "18zb4b10szrc1k908lxi3awygnhnbxsmki5y8zwalwkpnwlr8fln"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0-preview.2.23128.3"; sha256 = "04w085lrc24zmva5jy8lljhhwmml8p1aifzbjdg5lfm6grf9ncld"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-preview.2.23128.3"; sha256 = "1wq6g29zs5sb5x2vk7xkl8rvfckk8c52fpr28x0g948w3vrwqxyp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.0-preview.2.23128.3"; sha256 = "0y8zsvjws5y91ramribfbv7fmc7az27sfwrpj24jssw031ynxc25"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0-preview.2.23128.3"; sha256 = "08rf54a16697h8gk02y55dgn6amfx33zd0cbrrhx5ydwz8pa8a0g"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0-preview.2.23128.3"; sha256 = "18c92hvhalnvrl1z6ipr5m5wf24fd0plxq5mq7ryr8g2hwjbrawx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "8.0.0-preview.2.23128.3"; sha256 = "0x9lxg1rxj4hyab2a7qnyjczx35spq82hdscw0cvqyvarpnd705b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.0-preview.2.23128.3"; sha256 = "04fn90ljqbhnnxk4xirixqsk6ihkp3gc0jql8mqhx381yhy768pi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.0-preview.2.23128.3"; sha256 = "1787gkxs1wpbfwwa5qhbwwvmblskxaxsmgalngrzhsxjaiii4iqi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.0-preview.2.23128.3"; sha256 = "1c3kvfwbdr18sdjkgkh5wc4b5bwi5r9w7n69wxf35v9m4kgjppfn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "0w52hfw1la5372adc7g9px6xrql9yn2vamdg253vl4by2db1rwh3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "05qa5ym10q67q03yjqwz1anw38v3w2ajhm8rizsw1djcsfan5gri"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.2.23128.3"; sha256 = "0zkz24f4skx5qjx2xb2wqd33bgsm21j088ch2451nwmhrx9j3p0f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.2.23128.3"; sha256 = "0wa753mfcw2wxrvfj6n4n5dmnvf4phybixdizd2akhs6zmv4960g"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "19nfxqych48gwi1d2cfdfzfrr8kpqgp4xgqlrcan9y0s0cz3liv4"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "1ipm9vyhlhass856k7kzx0hnzk7lfsrwnkdgwqxqmkjdbvqvqywq"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.2.23128.3"; sha256 = "106vy0zk544cjmrx42cldji57lj2fiymbql9khmhk6w9xbp9p47h"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.2.23128.3"; sha256 = "0i2gyk8spj1mf8fiki3q2s3k82nxg6p7b0c924iyl2j65l4220xy"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "19lzsgbcd8f00gh4xmm21h2xjhb40hxxp53skjbs6jbklj4ip7vr"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "0hzgh4gy4ny5aa4hwab5y0scd8cazxic4bc8gdh3k1nlc143jfjh"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.2.23128.3"; sha256 = "1fzsxds8cfjq1z64fv8kn578m7hapydhcrdi5a8iir0zb8zr8cim"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.2.23128.3"; sha256 = "1v45affyh8kj22vfxx0f5mzbyf1wwm6l13k60gi9x4w38alz8wpx"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "0b0y6rckabwybgayvnkl8mxyiidc7vrr3rjaz8f590qik7ivmy7b"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "0sp1q5fzhma9v3mffcz34c8snkrvapp2fw2k341pmqqwqpb6xwi6"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.2.23128.3"; sha256 = "1gi1p0q21gd17r6wpwwl8wv20bprmma8hwmwypq0spb9bxhvamd6"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.2.23128.3"; sha256 = "1g5pcvl6kwn0k9815ikp17qn0dzgc9sq906k90vg57hchz3d4ycc"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "0ik1bljjbv41xf852b2c4kn7rdni5mr7yvdf0bqsz58pxdhghp4l"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "0yc2f7xjmk180l0nkj37ibal5lfiq032pq4zn36pjbpxdzz50ncw"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.2.23128.3"; sha256 = "1mpb7y9khhixbcmiqzc96h55d0ybic1cv6qmlsx57rh6kxpr7hwa"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.2.23128.3"; sha256 = "09m4b9wcqgkq21xq7006hhy7g7h477dbgnlydnjm1snlks9z3gmi"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "1yvk4wai07cmla4nvcn0vg60kc5himvwh4b0j3klb9pdjgrmvhlk"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "0zpbymx7ly9kfnslymcnscqq9yzcl0v4isd6j9nqrpbhphw6wi9q"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.2.23128.3"; sha256 = "1crfr78b0sy5xq16mqi6yzcx5srp6znafjh8rzcfj5pwgf4ajq2p"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.2.23128.3"; sha256 = "1mqzaw0gc7cy1v3rpr5mn15dyhlbdq2zrflcg1v10dcszf4yyr7i"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "11bs3lrf1kwz3fgkas3pc9c1qginbv98hfb4fngxam5818sdfy5g"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "0nb18mb8sddb457k236sdwwnms5jcdxkhvpacdp2vjzydsqxlf6s"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.2.23128.3"; sha256 = "191x8nhdc1g0ssil03imhwfv26pmijz3d8wc2wb2isllqhjsfz40"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.2.23128.3"; sha256 = "06bfmjc8fjrs81injfg6slwx9s3ph766l4fb76l63qcwn8sfhl8b"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "1q61wdr1v497aqx8bx0z0vmj03kckrp6cgwg8dzcnl2pgh9r1w96"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "1av1pnd7wqyd5h0rz9c03r5qg9g4br0in3f20lyskxmgfw5a48ri"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.2.23128.3"; sha256 = "1jr7495wc6g82syzlmf0hr9b4zim3yw6qz0yiadv1bh9aaq7c7pa"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.2.23128.3"; sha256 = "0zhappm1z4y8viyq7v9bw6ag4dksn4lshjgy56dlmshynv5hlaij"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "0vgvllxa1qv6yfk6r4xya71dy88dikgv07n4aafa4kaixa4mr67w"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "1z2zy2daxc2gizb3rs0sfqyz8wk6i38z7v35327j1hfgbfjzs956"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.2.23128.3"; sha256 = "047cc093hq9nqybpw8j2ffdjhyb3lr13zbwm1n41i61yknrba6p5"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.2.23128.3"; sha256 = "1chlxl1s5szcq2k3a661z05rvfwxw6nwqsgdx52d6irkkcmbyi6x"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "17ci6prvykrkaak5sfgbhg5x5x80kg0z7v6y56bm5k4hra32kcbn"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "14vgr8sbnsnqi8y9garinmn87qad114rgzhfcdjy558bjjargx3m"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.2.23128.3"; sha256 = "16bg1y9sw3fs5v02b6qqpd2xijhllnn4gqbd3862hz7yvqg1sj0z"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.2.23128.3"; sha256 = "1shhqi6rmsn80jp1275gwk50jai9c44a4lybrxy8hyq764z45rwy"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "0i8nlby3c0d4isj1w1slz7dznggdbjv7qgvssm00k7wv7j0hcanx"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "08yy7kc519h2d13z4b4ivb9w1r88xdwjr26gyqr7hmajql3mnnbn"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.2.23128.3"; sha256 = "1zn2gli8jp9gd0cgxf3k3iwma58sa1rd183phipcm4nb58203494"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.2.23128.3"; sha256 = "1rp9zcb7m6j3y2lmj9khs300r5rp5kwikhncsh2fhkchjwab821g"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "8.0.0-preview.2.23128.3"; sha256 = "03agvx2dcsaxj3aghhzilvgk22hhknhszp8m1sm8543nn867rrp8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.0-preview.2.23128.3"; sha256 = "00g4ijfqsi85iafcp84abxvf9v48m2fbsqhjqlmsly9j7ad9x0bd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.0-preview.2.23128.3"; sha256 = "16vv2sps29zfr9jm4cfbdzrz8231z6h060m2nyw6ydhlnrlnkxn0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.0-preview.2.23128.3"; sha256 = "1188fa6vns9260jcqb0j8xzzrh0m6m5zmxx7371bhkf0044xcvd6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0-preview.2.23128.3"; sha256 = "0hqlhir7xyna9fsvb3zsnb1gh11pbkscaz72q02ck0n3dcspygv3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.0-preview.2.23128.3"; sha256 = "1rzzb6p36jqgnww0yqgw1ca0vgjw5y85xalaqi2f2gr6m9aqw0n6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.0-preview.2.23128.3"; sha256 = "0aj8l590dcx6dl3kvcrpzdnvnkrf45f0k9plbz1818fd7irjcx22"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.0-preview.2.23128.3"; sha256 = "0vjzymlv7mjjpvl48sfr1c6fiz1nhl0ngbqdi7nkckgvl6l3zfkw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.0-preview.2.23128.3"; sha256 = "0nkvlxvfg2pbcfvv96xznr8zy892zjs5kps9iy17xsdxn5mwxx6n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.0-preview.2.23128.3"; sha256 = "0b3m0fsrmn0il6r0qj7nkq941s6pgjv6ik6vj3828ysz4ghsfsw2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.0-preview.2.23128.3"; sha256 = "0i6an1gkyplm2qf6gpp6k5qyrqaqg0jj5saylqgyq036fd4lsiig"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.0-preview.2.23128.3"; sha256 = "0w7cjcapw2lq36gfa8g831zfxfc0f6lr70nkm685va04k0lrn31k"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.0-preview.2.23128.3"; sha256 = "1gs80bi0j2zzlzqfbghb1jl6xgc7fqlm2hzd14hzqc0h7i0v2vki"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.0-preview.2.23128.3"; sha256 = "0lqsam08xd91nmjj0z6qfzn790m5zxp4v2i8r8drs69x6qbbfsid"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "0q1qn6r85baj8vs4xfncl9i9bxh2aiyym3a4qxl370ak42grv20p"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "0fld40l781sw2dyg9b9q9qyixj1sd4s50i3gimxp9pl74qmfxnx3"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.2.23128.3"; sha256 = "0wawwm6f1lkvg05gmbv92ghqcyb5aqbzj99k7mw9lr665gkyz5jz"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.2.23128.3"; sha256 = "1za3s3zihjkxgnm3p5l1p3bk0qx2bmryvnzvailpx5657qrlpkn2"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "0xgm3yrxny3zrqjh6qcfbi4zmrqysas1aidx4m5caqrr9xqxrb62"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.2.23128.3"; sha256 = "122rgxjp1lyy4rxm54qqksm6071jrqbha881pmgx9v452032s0mz"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.2.23128.3"; sha256 = "0i5ivx1gzd2c9qmxp0cdfvvpy83wylrjsssppkv24zxjwjhr059n"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.2.23128.3"; sha256 = "0p71n6w5fyicspdliix26y6rs711f17zdrlf6pp0agjgj75bkc24"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.2.23128.3"; sha256 = "096rczjnkc2nqcj0bp0i85n0fzak9m0nw4xvw189cbsv5wh1k2w8"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.2.23128.3"; sha256 = "0dg9ynq5lb7g2jfcwvp4fj7szm9y44hq52s523xmzfqnrnzvmr88"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.2.23128.3"; sha256 = "14lqrq81xn2s46xqg37fbn2vq7ibscrla52vsf03qj0f7869fdwn"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.2.23128.3"; sha256 = "0psiir0shm21asgfrfz2wi5kakwhvjz88ghm6ibl1clwkgx4lpx6"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.2.23128.3"; sha256 = "1y4636bb9y6rcj38v52lmdzps55l9wk0j4w2aywajw2jdmz9scqg"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.2.23128.3"; sha256 = "0fx2sa5yhc6avdhvpnvh3b9261j3msj2ypzqv6a49klk32jh7a2f"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.2.23128.3"; sha256 = "1xzgnb7vr5aj8il46qlx8fakkqyi4wbh1p24x2k9zqhrc92hmzlz"; }) ]; }; } From 984e27cd84672b1c9cbdabc3c88bea1e08acfbcf Mon Sep 17 00:00:00 2001 From: gilice <104317939+gilice@users.noreply.github.com> Date: Sat, 8 Apr 2023 15:17:54 +0200 Subject: [PATCH 060/169] fluffychat: fix encryption Closes #225283 --- .../networking/instant-messengers/fluffychat/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index e9b02b9cd385..28ffece57a40 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -8,6 +8,8 @@ , jsoncpp , wrapGAppsHook , makeDesktopItem +, openssl +, olm }: let @@ -36,7 +38,6 @@ stdenv.mkDerivation { genericName = "Chat with your friends (matrix client)"; categories = [ "Chat" "Network" "InstantMessaging" ]; }; - buildInputs = [ gtk3 libsecret jsoncpp ]; nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook imagemagick ]; @@ -45,7 +46,8 @@ stdenv.mkDerivation { mkdir -p $out/share mv * $out/share - ln -s $out/share/fluffychat $out/bin/fluffychat + makeWrapper "$out/share/fluffychat" "$out/bin/fluffychat" \ + --prefix "LD_LIBRARY_PATH" ":" "${lib.makeLibraryPath [ openssl olm ]}" FAV=$out/share/data/flutter_assets/assets/favicon.png ICO=$out/share/icons From 2741fe2ac110e33b9fd1b7713998a4dfe5dbae22 Mon Sep 17 00:00:00 2001 From: gilice <104317939+gilice@users.noreply.github.com> Date: Sat, 8 Apr 2023 15:20:48 +0200 Subject: [PATCH 061/169] fluffychat: fix version number on package search The version number wouldn't show up because search.nixos.org doesn't see the inherited variable. --- .../networking/instant-messengers/fluffychat/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index 28ffece57a40..7064a32365e1 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -13,15 +13,14 @@ }: let - version = "1.10.0"; # map of nix platform -> expected url platform platformMap = { x86_64-linux = "linux-x86"; aarch64-linux = "linux-arm64"; }; in -stdenv.mkDerivation { - inherit version; +stdenv.mkDerivation rec { + version = "1.10.0"; name = "fluffychat"; src = fetchzip { From a360e21d11d5f96099a412605b4b8282f1fe5c91 Mon Sep 17 00:00:00 2001 From: Jedsek Date: Sat, 8 Apr 2023 21:30:17 +0800 Subject: [PATCH 062/169] conceal: init at 0.3.2 --- pkgs/applications/misc/conceal/Cargo.lock | 842 +++++++++++++++++++++ pkgs/applications/misc/conceal/default.nix | 38 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 882 insertions(+) create mode 100644 pkgs/applications/misc/conceal/Cargo.lock create mode 100644 pkgs/applications/misc/conceal/default.nix diff --git a/pkgs/applications/misc/conceal/Cargo.lock b/pkgs/applications/misc/conceal/Cargo.lock new file mode 100644 index 000000000000..39e329dfcf6a --- /dev/null +++ b/pkgs/applications/misc/conceal/Cargo.lock @@ -0,0 +1,842 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-wincon", + "concolor-override", + "concolor-query", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" + +[[package]] +name = "anstyle-parse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-wincon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bumpalo" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "time 0.1.44", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "clap" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6efb5f0a41b5ef5b50c5da28c07609c20091df0c1fc33d418fa2a7e693c2b624" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "671fcaa5debda4b9a84aa7fde49c907c8986c0e6ab927e04217c9cb74e7c8bc9" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_complete" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01c22dcfb410883764b29953103d9ef7bb8fe21b3fa1158bc99986c2067294bd" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_complete_nushell" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fa41f5e6aa83bd151b70fd0ceaee703d68cd669522795dc812df9edad1252c" +dependencies = [ + "clap", + "clap_complete", +] + +[[package]] +name = "clap_derive" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.10", +] + +[[package]] +name = "clap_lex" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "conceal" +version = "0.3.2" +dependencies = [ + "clap", + "clap_complete", + "clap_complete_nushell", + "owo-colors", + "thiserror", + "time 0.3.20", + "trash", +] + +[[package]] +name = "concolor-override" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" + +[[package]] +name = "concolor-query" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "cxx" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 1.0.107", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "errno" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "iana-time-zone" +version = "0.1.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" +dependencies = [ + "hermit-abi", + "io-lifetimes", + "rustix", + "windows-sys", +] + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "libc" +version = "0.2.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" + +[[package]] +name = "link-cplusplus" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +dependencies = [ + "cc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d" + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "proc-macro2" +version = "1.0.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rustix" +version = "0.37.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c348b5dc624ecee40108aa2922fed8bad89d7fcc2b9f8cb18f632898ac4a37f9" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "scratch" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.10", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +dependencies = [ + "itoa", + "libc", + "num_threads", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "trash" +version = "3.0.1" +source = "git+https://github.com/TD-Sky/trash-rs?branch=conceal#7c698eeff381472fd3a253aa8b0dd2782d3d68db" +dependencies = [ + "chrono", + "libc", + "log", + "objc", + "once_cell", + "scopeguard", + "thiserror", + "url", + "windows", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasm-bindgen" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 1.0.107", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" diff --git a/pkgs/applications/misc/conceal/default.nix b/pkgs/applications/misc/conceal/default.nix new file mode 100644 index 000000000000..b4a6bfac6c47 --- /dev/null +++ b/pkgs/applications/misc/conceal/default.nix @@ -0,0 +1,38 @@ +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "conceal"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "TD-Sky"; + repo = pname; + rev = "v${version}"; + sha256 = "NKAp15mm/pH4g3+fPCxI6U8Y4qdAhV9CLkmII76oGrw="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "trash-3.0.1" = "sha256-6GTdT7pVy9yVMeZglPUS4kub2xVLW1h1uynE6zX3w98="; + }; + }; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion \ + completions/{cnc/cnc,conceal/conceal}.{bash,fish} \ + --zsh completions/{cnc/_cnc,conceal/_conceal} + ''; + + # There are no any tests in source project. + doCheck = false; + + meta = with lib; { + description = "A trash collector written in Rust"; + homepage = "https://github.com/TD-Sky/conceal"; + license = licenses.mit; + maintainers = with maintainers; [ jedsek ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00de72fa70b6..f6817c5bfe54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35410,6 +35410,8 @@ with pkgs; cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; + conceal = callPackage ../applications/misc/conceal { }; + confd = callPackage ../tools/system/confd { }; conmon = callPackage ../applications/virtualization/conmon { }; From e60a8a81a29d27159e6abfa3070703bb8f64307d Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 8 Apr 2023 16:15:44 +0200 Subject: [PATCH 063/169] linux_xanmod: 6.1.22 -> 6.1.23 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 033f89e449ff..12d7cbb37b9f 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,8 +3,8 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "6.1.22"; - hash = "sha256-eom3vlcbTTnVk+zcKja82mKmSmO8v0uqxccdA1VRj6s="; + version = "6.1.23"; + hash = "sha256-yKbePeImBpDLXfexvGJdghSBr3j/oFKXeMuBAOtDqJ8="; variant = "lts"; }; From 1bf652cedc21f2013dae5cd8be971b78be35aae5 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 8 Apr 2023 16:16:19 +0200 Subject: [PATCH 064/169] linux_xanmod_latest: 6.2.9 -> 6.2.10 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 12d7cbb37b9f..2b53cb33b4db 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -9,8 +9,8 @@ let }; mainVariant = { - version = "6.2.9"; - hash = "sha256-Nwd3C5YSfEO4/2fOzkQmNAqettvt6bM2Gz0k8a9O/DI="; + version = "6.2.10"; + hash = "sha256-zy6mKpoOu9YmGI6a8ZWjV761m+AGlTaWEzpL1QloCk8="; variant = "main"; }; From a93f7c28dd7a2e57666def8cd46d00c1349f3043 Mon Sep 17 00:00:00 2001 From: DPDmancul Date: Sat, 8 Apr 2023 16:23:11 +0200 Subject: [PATCH 065/169] wpaperd: 0.2.0 -> 0.3.0 https://github.com/danyspin97/wpaperd/releases/tag/0.3.0 --- pkgs/tools/wayland/wpaperd/Cargo.lock | 997 +++++++++++++++++-------- pkgs/tools/wayland/wpaperd/default.nix | 11 +- 2 files changed, 685 insertions(+), 323 deletions(-) diff --git a/pkgs/tools/wayland/wpaperd/Cargo.lock b/pkgs/tools/wayland/wpaperd/Cargo.lock index fb0b40fdcc7d..ea07ee7e61dd 100644 --- a/pkgs/tools/wayland/wpaperd/Cargo.lock +++ b/pkgs/tools/wayland/wpaperd/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ "gimli", ] @@ -17,12 +17,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - [[package]] name = "ahash" version = "0.7.6" @@ -36,13 +30,22 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.18" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "ansi_term" version = "0.12.1" @@ -52,13 +55,22 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "atomic" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" +dependencies = [ + "autocfg", +] + [[package]] name = "atty" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi 0.3.9", ] @@ -71,9 +83,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.65" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ "addr2line", "cc", @@ -94,7 +106,7 @@ dependencies = [ "cexpr", "clang-sys", "clap 2.34.0", - "env_logger 0.9.0", + "env_logger 0.9.3", "lazy_static", "lazycell", "log", @@ -124,15 +136,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.9.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "bytemuck" -version = "1.9.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc" +checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393" [[package]] name = "byteorder" @@ -142,19 +154,22 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "calloop" -version = "0.9.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf2eec61efe56aa1e813f5126959296933cf0700030e4314786c48779a66ab82" +checksum = "1a59225be45a478d772ce015d9743e49e92798ece9e34eda9a6aa2a6a7f40192" dependencies = [ "log", - "nix 0.22.3", + "nix 0.25.1", + "slotmap", + "thiserror", + "vec_map", ] [[package]] name = "cc" -version = "1.0.73" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cexpr" @@ -167,9 +182,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e068cb2806bbc15b439846dc16c5f89f8599f2c3e4d73d4449d38f9b2f0b6c5" +checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" dependencies = [ "smallvec", ] @@ -187,10 +202,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "clang-sys" -version = "1.3.1" +name = "chrono" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +dependencies = [ + "iana-time-zone", + "num-integer", + "num-traits", + "winapi 0.3.9", +] + +[[package]] +name = "clang-sys" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" dependencies = [ "glob", "libc", @@ -207,43 +234,41 @@ dependencies = [ "atty", "bitflags", "strsim 0.8.0", - "textwrap 0.11.0", + "textwrap", "unicode-width", "vec_map", ] [[package]] name = "clap" -version = "3.1.10" +version = "4.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3124f3f75ce09e22d1410043e1e24f2ecc44fad3afe4f08408f1f7663d68da2b" +checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" dependencies = [ - "atty", "bitflags", "clap_derive", "clap_lex", - "indexmap", - "lazy_static", + "is-terminal", + "once_cell", "strsim 0.10.0", "termcolor", "terminal_size", - "textwrap 0.15.0", ] [[package]] name = "clap_complete" -version = "3.1.2" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1506b87ee866f7a53a5131f7b31fba656170d797e873d0609884cfd56b8bbda8" +checksum = "bd125be87bf4c255ebc50de0b7f4d2a6201e8ac3dc86e39c0ad081dc5e7236fe" dependencies = [ - "clap 3.1.10", + "clap 4.1.6", ] [[package]] name = "clap_derive" -version = "3.1.7" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" dependencies = [ "heck", "proc-macro-error", @@ -254,28 +279,38 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.1.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "189ddd3b5d32a70b35e7686054371742a937b0d99128e76dde6340210e966669" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" dependencies = [ "os_str_bytes", ] [[package]] name = "clap_mangen" -version = "0.1.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2ff85c3fa1e7c1a4229f7b4221f769757c3982e2afd3e6d9381d59db2c7e61" +checksum = "48283ce8d5cd9513633949a674a0442bcb507ab61ed6533863437052ddbb494b" dependencies = [ - "clap 3.1.10", + "clap 4.1.6", "roff", ] [[package]] -name = "color-eyre" -version = "0.6.1" +name = "codespan-reporting" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ebf286c900a6d5867aeff75cfee3192857bb7f24b547d4f0df2ed6baa812c90" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color-eyre" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" dependencies = [ "backtrace", "eyre", @@ -290,6 +325,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + [[package]] name = "crc32fast" version = "1.3.2" @@ -301,9 +342,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -311,9 +352,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -322,26 +363,68 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.8" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ "autocfg", "cfg-if 1.0.0", "crossbeam-utils", - "lazy_static", - "memoffset", + "memoffset 0.7.1", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.8" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if 1.0.0", - "lazy_static", +] + +[[package]] +name = "cxx" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -365,23 +448,14 @@ dependencies = [ [[package]] name = "dcv-color-primitives" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b58624a9256deeba461254461fd0155411330d64168b7b6e55cdb4e89e84c331" +checksum = "1457f4dd8395fef9f61996b5783b82ed7b234b4b55e1843d04e07fded0538005" dependencies = [ "paste", "wasm-bindgen", ] -[[package]] -name = "deflate" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" -dependencies = [ - "adler32", -] - [[package]] name = "dirs" version = "4.0.0" @@ -419,9 +493,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "either" -version = "1.6.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "env_logger" @@ -438,9 +512,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", "humantime", @@ -449,6 +523,27 @@ dependencies = [ "termcolor", ] +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "eyre" version = "0.6.8" @@ -461,39 +556,61 @@ dependencies = [ [[package]] name = "fallible_collections" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52db5973b6a19247baf19b30f41c23a1bfffc2e9ce0a5db2f60e3cd5dc8895f7" +checksum = "3f57ccc32870366ae684be48b32a1a2e196f98a42a9b4361fe77e13fd4a34755" dependencies = [ "hashbrown", ] [[package]] -name = "filetime" -version = "0.2.16" +name = "figment" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" +checksum = "4e56602b469b2201400dec66a66aec5a9b8761ee97cd1b8c96ab2483fcc16cc9" +dependencies = [ + "atomic", + "serde", + "toml 0.5.11", + "uncased", + "version_check", +] + +[[package]] +name = "filetime" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "winapi 0.3.9", + "windows-sys", +] + +[[package]] +name = "flate2" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +dependencies = [ + "crc32fast", + "miniz_oxide", ] [[package]] name = "flexi_logger" -version = "0.22.3" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969940c39bc718475391e53a3a59b0157e64929c80cf83ad5dde5f770ecdc423" +checksum = "010b5c83ec9d37d9636aa37132b777ef0818949b217109de9b88784e923bbf3a" dependencies = [ - "ansi_term", "atty", + "chrono", "glob", "lazy_static", "log", - "rustversion", + "nu-ansi-term", "thiserror", - "time", ] [[package]] @@ -533,9 +650,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "getrandom" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if 1.0.0", "libc", @@ -544,30 +661,30 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "hashbrown" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ "ahash", ] [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -578,6 +695,21 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hotwatch" version = "0.4.6" @@ -605,10 +737,34 @@ dependencies = [ ] [[package]] -name = "image" -version = "0.24.1" +name = "iana-time-zone" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db207d030ae38f1eb6f240d5a1c1c88ff422aa005d10f8c6c6fc5e75286ab30e" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "image" +version = "0.24.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" dependencies = [ "bytemuck", "byteorder", @@ -617,7 +773,6 @@ dependencies = [ "dcv-color-primitives", "jpeg-decoder", "mp4parse", - "num-iter", "num-rational", "num-traits", "png", @@ -631,9 +786,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "1.8.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", "hashbrown", @@ -659,6 +814,16 @@ dependencies = [ "libc", ] +[[package]] +name = "io-lifetimes" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +dependencies = [ + "libc", + "windows-sys", +] + [[package]] name = "iovec" version = "0.1.4" @@ -669,20 +834,35 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.1" +name = "is-terminal" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys", +] [[package]] name = "jpeg-decoder" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744c24117572563a98a7e9168a5ac1ee4a1ca7f702211258797bbe0ed0346c3c" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" dependencies = [ "rayon", ] +[[package]] +name = "js-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +dependencies = [ + "wasm-bindgen", +] + [[package]] name = "kernel32-sys" version = "0.2.2" @@ -707,40 +887,55 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.124" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if 1.0.0", "winapi 0.3.9", ] [[package]] -name = "log" -version = "0.4.16" +name = "link-cplusplus" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.3.1" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357" +checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" dependencies = [ "libc", ] @@ -754,6 +949,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[package]] name = "mime" version = "0.3.16" @@ -768,9 +972,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.5.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] @@ -835,9 +1039,9 @@ dependencies = [ [[package]] name = "net2" -version = "0.2.37" +version = "0.2.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" dependencies = [ "cfg-if 0.1.10", "libc", @@ -856,39 +1060,50 @@ dependencies = [ [[package]] name = "nix" -version = "0.22.3" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ + "autocfg", "bitflags", - "cc", "cfg-if 1.0.0", "libc", - "memoffset", + "memoffset 0.6.5", ] [[package]] name = "nix" -version = "0.24.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d99b651ff9697d6710f9613a07c5b4e0d655040faf56b3b471af108d55597" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ "bitflags", "cfg-if 1.0.0", "libc", - "memoffset", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", ] [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", ] +[[package]] +name = "nom8" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" +dependencies = [ + "memchr", +] + [[package]] name = "notify" version = "4.0.17" @@ -908,31 +1123,30 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.44" +name = "nu-ansi-term" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ - "autocfg", - "num-traits", + "overload", + "winapi 0.3.9", ] [[package]] -name = "num-iter" -version = "0.1.42" +name = "num-integer" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", - "num-integer", "num-traits", ] [[package]] name = "num-rational" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", "num-integer", @@ -941,64 +1155,61 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ + "hermit-abi 0.2.6", "libc", ] [[package]] name = "object" -version = "0.28.3" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.10.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "os_str_bytes" -version = "6.0.0" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owo-colors" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e72e30578e0d0993c8ae20823dd9cff2bc5517d2f586a8aef462a581e8a03eb" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "paste" -version = "1.0.7" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] name = "peeking_take_while" @@ -1007,28 +1218,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] -name = "pkg-config" -version = "0.3.25" +name = "pin-utils" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "png" -version = "0.17.5" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba" +checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" dependencies = [ "bitflags", "crc32fast", - "deflate", + "flate2", "miniz_oxide", ] [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-error" @@ -1056,18 +1273,27 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.37" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ - "unicode-xid", + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" +dependencies = [ + "memchr", ] [[package]] name = "quote" -version = "1.0.18" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -1095,30 +1321,28 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom", ] [[package]] name = "rayon" -version = "1.5.2" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.2" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4" +checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -1128,9 +1352,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.13" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ "bitflags", ] @@ -1148,9 +1372,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.5" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -1159,9 +1383,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "roff" @@ -1182,10 +1406,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustversion" -version = "1.0.6" +name = "rustix" +version = "0.36.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] [[package]] name = "same-file" @@ -1196,6 +1428,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + [[package]] name = "scopeguard" version = "1.1.0" @@ -1203,25 +1441,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "serde" -version = "1.0.136" +name = "scratch" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.136" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + [[package]] name = "shlex" version = "1.1.0" @@ -1230,21 +1483,32 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "slab" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +dependencies = [ + "version_check", +] [[package]] name = "smallvec" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smithay-client-toolkit" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a28f16a97fa0e8ce563b2774d1e732dd5d4025d2772c5dba0a41a0f90a29da3" +version = "0.16.0" +source = "git+https://github.com/Smithay/client-toolkit#a3d1af852a607587114ccc6631c87046ecc898d3" dependencies = [ "bitflags", "calloop", @@ -1252,11 +1516,15 @@ dependencies = [ "lazy_static", "log", "memmap2", - "nix 0.22.3", + "nix 0.26.2", "pkg-config", + "thiserror", + "wayland-backend", "wayland-client", "wayland-cursor", "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", ] [[package]] @@ -1279,45 +1547,45 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.91" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] name = "system-deps" -version = "6.0.2" +version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709" +checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml", + "toml 0.5.11", "version-compare", ] [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "terminal_size" -version = "0.1.17" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +checksum = "4c9afddd2cec1c0909f06b00ef33f94ab2cc0578c4a610aa208ddfec8aa2b43a" dependencies = [ - "libc", - "winapi 0.3.9", + "rustix", + "windows-sys", ] [[package]] @@ -1329,29 +1597,20 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "textwrap" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" -dependencies = [ - "terminal_size", -] - [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -1359,35 +1618,55 @@ dependencies = [ ] [[package]] -name = "time" -version = "0.3.9" +name = "toml" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "itoa", - "libc", - "num_threads", - "time-macros", + "serde", ] -[[package]] -name = "time-macros" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" - -[[package]] -name = "timer" -version = "0.2.0" -source = "git+https://github.com/danyspin97/timer.rs#f99861cacd5f092b9f1099c5a025a0ba7492139a" - [[package]] name = "toml" -version = "0.5.9" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6a7712b49e1775fb9a7b998de6635b299237f48b404dde71704f2e0e7f37e5" +dependencies = [ + "indexmap", + "nom8", + "serde", + "serde_spanned", + "toml_datetime", +] + +[[package]] +name = "uncased" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622" +dependencies = [ + "version_check", ] [[package]] @@ -1400,16 +1679,16 @@ dependencies = [ ] [[package]] -name = "unicode-width" -version = "0.1.9" +name = "unicode-ident" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] -name = "unicode-xid" -version = "0.2.2" +name = "unicode-width" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "vec_map" @@ -1419,9 +1698,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version-compare" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" [[package]] name = "version_check" @@ -1442,15 +1721,15 @@ dependencies = [ [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.80" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -1458,13 +1737,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.80" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", "syn", @@ -1473,9 +1752,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.80" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1483,9 +1762,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.80" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", @@ -1496,89 +1775,106 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.80" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] -name = "wayland-client" -version = "0.29.4" +name = "wayland-backend" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91223460e73257f697d9e23d401279123d36039a3f7a449e983f123292d4458f" +checksum = "79ebd48bfc1178c9190c7ff80cc822b3335ffc83141e9aa723168f377257623e" dependencies = [ - "bitflags", + "cc", "downcast-rs", - "libc", - "nix 0.22.3", - "wayland-commons", - "wayland-scanner", - "wayland-sys", -] - -[[package]] -name = "wayland-commons" -version = "0.29.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f6e5e340d7c13490eca867898c4cec5af56c27a5ffe5c80c6fc4708e22d33e" -dependencies = [ - "nix 0.22.3", - "once_cell", + "io-lifetimes", + "nix 0.26.2", + "scoped-tls", "smallvec", "wayland-sys", ] [[package]] -name = "wayland-cursor" -version = "0.29.4" +name = "wayland-client" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c52758f13d5e7861fc83d942d3d99bf270c83269575e52ac29e5b73cb956a6bd" +checksum = "85bde68449abab1a808e5227b6e295f4ae3680911eb7711b4a2cb90141edb780" dependencies = [ - "nix 0.22.3", + "bitflags", + "calloop", + "log", + "nix 0.26.2", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-cursor" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0c3a0d5b4b688b07b0442362d3ed6bf04724fcc16cd69ab6285b90dbc487aa" +dependencies = [ + "nix 0.26.2", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.29.4" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60147ae23303402e41fe034f74fb2c35ad0780ee88a1c40ac09a3be1e7465741" +checksum = "7fefbeb8a360abe67ab7c2efe1d297a1a50ee011f5460791bc18870c26bb84e2" dependencies = [ "bitflags", + "wayland-backend", "wayland-client", - "wayland-commons", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fce991093320e4a6a525876e6b629ab24da25f9baef0c2e0080ad173ec89588a" +dependencies = [ + "bitflags", + "wayland-backend", + "wayland-client", + "wayland-protocols", "wayland-scanner", ] [[package]] name = "wayland-scanner" -version = "0.29.4" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a1ed3143f7a143187156a2ab52742e89dac33245ba505c17224df48939f9e0" +checksum = "4834c14b3edf1d9986c83ca79b1e7e3afbe9874c7c144702f6467063259ce45d" dependencies = [ "proc-macro2", + "quick-xml", "quote", - "xml-rs", ] [[package]] name = "wayland-sys" -version = "0.29.4" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9341df79a8975679188e37dab3889bfa57c44ac2cb6da166f519a81cbe452d4" +checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" dependencies = [ + "dlib", + "log", "pkg-config", ] [[package]] name = "which" -version = "4.2.5" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", - "lazy_static", "libc", + "once_cell", ] [[package]] @@ -1625,13 +1921,81 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "wpaperd" -version = "0.2.0" +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "clap 3.1.10", + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + +[[package]] +name = "wpaperd" +version = "0.3.0" +dependencies = [ + "clap 4.1.6", "clap_complete", "clap_mangen", "color-eyre", + "dirs", + "figment", "flexi_logger", "hotwatch", "humantime-serde", @@ -1639,12 +2003,11 @@ dependencies = [ "log", "mime", "new_mime_guess", - "nix 0.24.0", + "nix 0.26.2", "rand", "serde", "smithay-client-toolkit", - "timer", - "toml", + "toml 0.7.2", "walkdir", "xdg", ] @@ -1676,9 +2039,3 @@ checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6" dependencies = [ "dirs", ] - -[[package]] -name = "xml-rs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" diff --git a/pkgs/tools/wayland/wpaperd/default.nix b/pkgs/tools/wayland/wpaperd/default.nix index aff9b54334df..76a9bd5e24dd 100644 --- a/pkgs/tools/wayland/wpaperd/default.nix +++ b/pkgs/tools/wayland/wpaperd/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "wpaperd"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "danyspin97"; repo = pname; rev = version; - sha256 = "n1zlC2afog0UazsJEBAzXpnhVDeP3xqpNGXlJ65umHQ="; + sha256 = "cgjHCSBrkX3aoz42qBS/1JUGhc7sZKarKByntp7ubaQ="; }; nativeBuildInputs = [ @@ -21,10 +21,15 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "timer-0.2.0" = "sha256-yofy6Wszf6EwNGGdVDWNG0RcbpvBgv5/BdOjAFxghwc="; + "smithay-client-toolkit-0.16.0" = "iPDL7pxTez4EnIBaUH25lLSWpu3RRL2QBF9pfdTDsP8="; }; }; + postPatch = '' + rm Cargo.lock + ln -s ${./Cargo.lock} Cargo.lock + ''; + meta = with lib; { description = "Minimal wallpaper daemon for Wayland"; longDescription = '' From 7344ae11ab37423865c34533d317ebeb2c2feb4d Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sat, 8 Apr 2023 16:47:37 +0200 Subject: [PATCH 066/169] fnott: add zlib license to list fnott bundles nanosvg in-tree and builds with it, which is licensed under the zlib license. The `license` meta-attr should reflect this (as this more or less means nanosvg is part of the project), thus add the zlib license to it. See the pull-request discussion [0] and other precedents like [1]. [0] https://github.com/NixOS/nixpkgs/pull/225224 [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=982145#74 Signed-off-by: Christoph Heiss --- pkgs/applications/misc/fnott/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index 5a76ef9028ed..311e532c1267 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://codeberg.org/dnkl/fnott"; description = "Keyboard driven and lightweight Wayland notification daemon for wlroots-based compositors"; - license = licenses.mit; + license = with licenses; [ mit zlib ]; maintainers = with maintainers; [ polykernel ]; platforms = platforms.linux; }; From cbff37bcbc5e006758b5db46b2a03cc3928e9f96 Mon Sep 17 00:00:00 2001 From: Lionello Lunesu Date: Sat, 8 Apr 2023 08:01:31 -0700 Subject: [PATCH 067/169] pulumi-bin: 3.60.0 -> 3.62.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 242 +++++++++++++-------------- 1 file changed, 121 insertions(+), 121 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index b124e250af91..a06c13293a95 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,40 +1,40 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.60.0"; + version = "3.62.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.60.0-linux-x64.tar.gz"; - sha256 = "0hvmwwbin8qmsqcj6wp4qd8i8qn47gjc3zbpax0xq0657xikq71s"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.62.0-linux-x64.tar.gz"; + sha256 = "1xr55za8d1hqs97gg7wjyggv052dg041qjrqn34fkgnlzfd4mzpx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.0.2-linux-amd64.tar.gz"; - sha256 = "02zk0141nwrxr7l08a0401k2wvhz4qasdbfx2iykr9k0whv12smi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.1.0-linux-amd64.tar.gz"; + sha256 = "07crb0rs2cflq0g2y1gnri9pfazawhbr58lis31qm7qk4d00r1j6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.3.0-linux-amd64.tar.gz"; sha256 = "0n01d1n5xnxz9z4djcl32lv2szz7jsr3hjdfl7ajnmss0zmc5jwk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.34.0-linux-amd64.tar.gz"; - sha256 = "07nd8nqarlkgc6y031bmniz3qlrg6q7sgv819a6fzzbmbv56791m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.35.0-linux-amd64.tar.gz"; + sha256 = "0zxzjw04lp7ayjh781098fnvpjzmdga9r7gxsyvilb34n3p0jwzd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.2.0-linux-amd64.tar.gz"; - sha256 = "1dr507c4wlqj0qlnddvbg9v2xbwnrhkrd0qg26p25xxrm0qfcd9y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.2.1-linux-amd64.tar.gz"; + sha256 = "0bwc506j7azz34smkydlpxr55yznxp3qnp7zw7cd9j3gv6z73r2v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.18.0-linux-amd64.tar.gz"; sha256 = "1lz34a178hsix18rpwv9kr8w0f2vyglbf27c23lm57r98860i5rx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.33.0-linux-amd64.tar.gz"; - sha256 = "0565nqzjbqfrf0yiy9igh51g4dm6mwjna0kj9dpmbj637w7fa53s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.35.0-linux-amd64.tar.gz"; + sha256 = "1sl0987dyzlb7nw5n4cbxzapz8722irk3x8mhqvpi4409zjwsh5v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.38.0-linux-amd64.tar.gz"; - sha256 = "12h6pi8aahf97b7cnyksw1gjj6calc45n71bpmv7ac6vbzl9scb2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.39.0-linux-amd64.tar.gz"; + sha256 = "09zy6x7si84fqv9nhxd5s2169nwqp8l2rzqk6h9yghx2x7zgg8w1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.36.0-linux-amd64.tar.gz"; @@ -61,40 +61,40 @@ sha256 = "0zknpam1li0slymr381825rssnpcd0m2wvakqnaihzxlh4m6arvi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.1.0-linux-amd64.tar.gz"; - sha256 = "1yddrhcm3aw02lfm7jmhlw7946zk5w1k05sfd5zwvyyr6pqdk3jc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.1.2-linux-amd64.tar.gz"; + sha256 = "02axpxakd6vjsnkgn14vfai8p20ifl38rhwq66499lccpwikc7zv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v7.1.0-linux-amd64.tar.gz"; - sha256 = "05mnm9436kih5dllv6sizcdv165rhnwg9dnl9yjci06rhj2njb73"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v7.2.0-linux-amd64.tar.gz"; + sha256 = "184y56wh035xjm1bphjcb67cfnpjrniwzq40m1aahhwm1l74x3gx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.52.0-linux-amd64.tar.gz"; - sha256 = "028q359ms8whsg41siip6rw0kbg7xf5hwjxnwfzlmx2p42m78pf7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.53.0-linux-amd64.tar.gz"; + sha256 = "0rv8rvskm0cqida6hrqg8basc2m8kcx7pazlyxz5r86nj4wascb3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.6.0-linux-amd64.tar.gz"; - sha256 = "0j9150spxmviy7hgxyhm1j07gjizv2q4r0v66aywfvn1bkqrwhxc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.7.0-linux-amd64.tar.gz"; + sha256 = "0zz88ff478w3lp3branpdkzw2gla29xdz7zjbiaqwj5gpc0njp12"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-linux-amd64.tar.gz"; sha256 = "094vc026li9s76y05p778siikq0dg6lgqdnx4cby4qqipfwvnf7m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.28.0-linux-amd64.tar.gz"; - sha256 = "0798n2rl43scazjhdmyfx7pi0dfil4gdwl46q5gaqf6jpk4wakdw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.29.0-linux-amd64.tar.gz"; + sha256 = "14k9vsi4phsc0wiwp0fzq6jc02bkd78symcn89z4gsli2xrfkdxv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.3-linux-amd64.tar.gz"; sha256 = "1gd5p5sckjmzbdb94kadaddzbl1j1lw254jhq63mgnh6v2wwij17"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.2-linux-amd64.tar.gz"; - sha256 = "1ic4p5nb13drnfmrb8rzx01rk3w06a6dn84cg7k9alcs1wglfqv1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.3-linux-amd64.tar.gz"; + sha256 = "0lzc4fj89xp2f1dx3rm44mvaqnby1r181yy145gcmkky1jqi95rd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-linux-amd64.tar.gz"; @@ -117,12 +117,12 @@ sha256 = "0yrzdbcvg16a2v7hc6rq4cmavimkj4hjxd3kfkw8gd2cbi4kcmwf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.12.0-linux-amd64.tar.gz"; - sha256 = "1ka4rlycbsays75av3vlilqs4s3wdv8c8sjy9b5wfbv4cs7g18il"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.12.1-linux-amd64.tar.gz"; + sha256 = "19g6n7afv1rkca9j0388v5ypn458pawzfhlcwgvkn6aj4c5fbawr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.20.0-linux-amd64.tar.gz"; - sha256 = "167ldznmkll8ryplqrw8xj5fjxfj3hjmpy3ifm83in9qwjbdrhj7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.21.0-linux-amd64.tar.gz"; + sha256 = "1v6hhz59xnnvx24b0p0yhh4a387n0kws6bdilnamld3hrr8c5x1b"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.28.0-linux-amd64.tar.gz"; @@ -153,8 +153,8 @@ sha256 = "0svlqccq9rb00hz8g5fbpb7r6wf5wbjacab8rvjcb13wvrc8rx54"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.2.0-linux-amd64.tar.gz"; - sha256 = "11yvdszdd35hz3cd7l2vs5m45pf4zv7lvbmrsfr3i00s3d5rmzj0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.3.0-linux-amd64.tar.gz"; + sha256 = "0c94qzjm1bg3pflc20jnff1aiq3idrxcv3rmq91xa16fiqqzlskz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz"; @@ -163,36 +163,36 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.60.0-darwin-x64.tar.gz"; - sha256 = "0l3qg3np4hs21gkrbxcf8swkwg3pvrsfcid3rx65pw5isxpy0wyv"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.62.0-darwin-x64.tar.gz"; + sha256 = "07ibkl29wmwln1mh55i088x21p0snbrgr7jk615y6bdbwvb8y1ym"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.0.2-darwin-amd64.tar.gz"; - sha256 = "05jffzbl2pqczyc9d5lykrqwyx62bnzmxjn9q53pqvdw5faamypw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.1.0-darwin-amd64.tar.gz"; + sha256 = "02j4wqzjpi3bxy96gngdyv04c6rff3v11pd073fpcwly5v7hc951"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.3.0-darwin-amd64.tar.gz"; sha256 = "1i07ysdy09ps0l40qz7acj69b6l30q3y4l4cabg3wbrzwxzsa0ki"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.34.0-darwin-amd64.tar.gz"; - sha256 = "17vqz4i9vvp3lw2qa2ya34pgi6fp2ql35njq3bn6dv1lw65mk7wq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.35.0-darwin-amd64.tar.gz"; + sha256 = "1k5lriwzszwil38s8aphfv335ym9wcf7l42hn4wicf5ky42d8c6h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "04hw0pr8p77nxlc6xp0f4irsl3wn60d393389s1m7b4yzknjsald"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.2.1-darwin-amd64.tar.gz"; + sha256 = "1v6q08vkjfdj2jhv83qvmcgb5vr2xx8zrq3wyqa98l81bi6i36vz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.18.0-darwin-amd64.tar.gz"; sha256 = "1hlvacv7nwizbijzqfxv996jms2vjak46pnp2mixr05zlmf0p890"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.33.0-darwin-amd64.tar.gz"; - sha256 = "0vvci7qsms2dkq1wv9x9pdzkcxa3392a30w7z5zk00bnsbhwj0fn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.35.0-darwin-amd64.tar.gz"; + sha256 = "0zz5wv4gvjzgr8mhr3zp2mkrmsg56ifajg5qjh1i1i0x5sv99rsn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.38.0-darwin-amd64.tar.gz"; - sha256 = "00k4km6iha2m8jsp2p4m9smmcb8cmxwhgmdnmlpy2jwpfzppqq0f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.39.0-darwin-amd64.tar.gz"; + sha256 = "002pw2c6bx7jpqm4kvv86ra5hrs0dzj6cn0pa73gzw4b2sdpy33n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.36.0-darwin-amd64.tar.gz"; @@ -219,40 +219,40 @@ sha256 = "0vpa47dbqv4bw2i2ayxzh9xlph6y0l1sjrb203f55l312z5y2g22"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.1.0-darwin-amd64.tar.gz"; - sha256 = "0jgjwf5hbmncl2xkw2mpr0cp8dh5gszlfmgsii6jcnx69pc02f5r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.1.2-darwin-amd64.tar.gz"; + sha256 = "0sn4fzvlxpadsbdb56nc7b46sfi967xn3wsp2jd045g0lhkbz7fn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v7.1.0-darwin-amd64.tar.gz"; - sha256 = "0agdb3yz11vv7jdfj5yawxrm7ibbd1b544lk7ndzfkdmyw1myfwl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v7.2.0-darwin-amd64.tar.gz"; + sha256 = "1033h9k8ffyyprd5cvk8l93d1bvhfa91cb866vxz6v1ldgwjrqrf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.52.0-darwin-amd64.tar.gz"; - sha256 = "0ngdsp70v05pirmdlzxafxpmd1zbc7dlaqfi2ibw0943kd1gwz53"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.53.0-darwin-amd64.tar.gz"; + sha256 = "1dz3kxdcbagxspjvhimk8ly93fyih0i145z9870jdw9z4m1cl9f2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.6.0-darwin-amd64.tar.gz"; - sha256 = "01wqabdmp82706a1hqd03mbhbxh9vq4aib9csqm9gpabyyfq6zvh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.7.0-darwin-amd64.tar.gz"; + sha256 = "0nwblnw3a9ya7841iph7cd0nnwg95wbmjx2w7qc9052c2mawvl9q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-darwin-amd64.tar.gz"; sha256 = "12imy2q8bl255cmc26swa6kflcb08gkh7mnvwxss8nzj0a6rl8vw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.28.0-darwin-amd64.tar.gz"; - sha256 = "016n1dknmlhizjh6z923kr68ma7z0xhbxg29kjfay83gn216r4am"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.29.0-darwin-amd64.tar.gz"; + sha256 = "0np10lxwingxxy4m9j2h7nh9yiwzb79fj10cq8iqjdi1m852nl1f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.3-darwin-amd64.tar.gz"; sha256 = "09xi66s68h5966hv4vczc4z72awyaqncbkdcg03q3jjawg3lz32y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.2-darwin-amd64.tar.gz"; - sha256 = "0kp8svvlzj04k7kckz811drnspfkb9405z5m98g4i45vbjyyrpp6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.3-darwin-amd64.tar.gz"; + sha256 = "0fnwx6qsa5j62hq2rjfw5zdsvhasjnzl9a4lal57j0y033p1hqdb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-darwin-amd64.tar.gz"; @@ -275,12 +275,12 @@ sha256 = "0q9hjfyn4r14fplxx597kjy8g3jpcps4bp7gsyy4ri8fipldjnf3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.12.0-darwin-amd64.tar.gz"; - sha256 = "0p55ghgc27rrwki345m13k8jrxkknapgml8b8mbzbgcl7gy1z829"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.12.1-darwin-amd64.tar.gz"; + sha256 = "1iyybcphd7j6zy29ka1cxd98cbzczdfc70fy0rjg8a07zh6qsrnr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.20.0-darwin-amd64.tar.gz"; - sha256 = "108lbp651i38r1z2d3jcrdcpn673p4crdsjapn9snm0vpj8w7v4c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.21.0-darwin-amd64.tar.gz"; + sha256 = "18f6abks19vcmagd4kpd9c0lh7vv9g10dswxshpkrfpik6xn9hnp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.28.0-darwin-amd64.tar.gz"; @@ -311,8 +311,8 @@ sha256 = "1g7jcwrff8nd1m6fmvfri3nfgby8agcwmq60ascd45mkianwf2i8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.2.0-darwin-amd64.tar.gz"; - sha256 = "03wn8hm42xn6rnnfinckhfznz4i1mpb6h37kgchpv0s4akapv97r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.3.0-darwin-amd64.tar.gz"; + sha256 = "0pb4cvmmg403jzgy947lsmnhwy2hy422ar0s9izxwjn9yqay573w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz"; @@ -321,36 +321,36 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.60.0-linux-arm64.tar.gz"; - sha256 = "08h5i6pp4bg11whlacmmkixp5fk03gylw5dg8vva56n2cvqkdgms"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.62.0-linux-arm64.tar.gz"; + sha256 = "0g1g5dldmcl6rkr0dz9whdzkq8p6b7w83jmk0m0ms9paqv76lvw6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.0.2-linux-arm64.tar.gz"; - sha256 = "132ah2lqssdwdfmk97nslc7bfhk5qkqklnasl9anrk61cp095lg7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.1.0-linux-arm64.tar.gz"; + sha256 = "1g4zb6hx5541xxshgdiwgryv0rw5kq5z3h0xk7p7h6lb5f14a278"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.3.0-linux-arm64.tar.gz"; sha256 = "1h92d4n9n4ia7y8lnah9fpfkz6yzyxa6dh69kv2cjk17m57x6h0v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.34.0-linux-arm64.tar.gz"; - sha256 = "193z4r64ic016m74iy6fzwfldjvjbpknvdc63jdns1ls4wdvg152"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.35.0-linux-arm64.tar.gz"; + sha256 = "1g6gzcyrskhv6873nhnz4190fylljyishm8qsf3g79zk55bdikj6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.2.0-linux-arm64.tar.gz"; - sha256 = "0mb5cc0q83mxaap3jhqn3cx8cxmixb7hn3zapg18ak000zvp248q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.2.1-linux-arm64.tar.gz"; + sha256 = "1g8819p3n6r0ydmnf54qb0iyd8nn3jjhi4cj40fmlkk4biazafdi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.18.0-linux-arm64.tar.gz"; sha256 = "0s6ifpr0y0wyik9zdf9ydmky2w0501bcafpswmrar6hvblgbgiib"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.33.0-linux-arm64.tar.gz"; - sha256 = "1bzadspszwm7gvynmd7zaw6r23f7w3pr7ck4axs8nix6mvdkgc0s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.35.0-linux-arm64.tar.gz"; + sha256 = "1y4pfa8ld4pa2205p21k4khzi8yh3bqfq880536hw85lvpgn90gq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.38.0-linux-arm64.tar.gz"; - sha256 = "0b3l53b34mz7b4nqr483p1rby9sm7fdjxql3wmj621k5czg48s2n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.39.0-linux-arm64.tar.gz"; + sha256 = "084pjdam68z4kasf4nl2bva5q8nwa0ah89rn2xz239by3y0bia4b"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.36.0-linux-arm64.tar.gz"; @@ -377,40 +377,40 @@ sha256 = "1dq6nbvh1py951s2ips23fh4dg50r67d9g91r94ahagzb75pj5ml"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.1.0-linux-arm64.tar.gz"; - sha256 = "0vkvkrbsivaklqwg9g0qh5dsjw7c5l8igs0h7p1g301kvndlqsra"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.1.2-linux-arm64.tar.gz"; + sha256 = "1h9kpbbbfh8q5j9mym8j48nk54sfxyprsi8gdivk4sx27lx81fkh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v7.1.0-linux-arm64.tar.gz"; - sha256 = "1dw3kf7h83lqgd6vpjqlwb9y11aa3wd7kagdc0gzhp7qxd0iwirl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v7.2.0-linux-arm64.tar.gz"; + sha256 = "0cwv7cjd96yj0c86dng4k2yybrw1dk68qhrijcszm3vj91ch4nmi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.52.0-linux-arm64.tar.gz"; - sha256 = "07qkpnjw5zg0mw50l1pmhxx0j3aqzn5v5cn987564jr4lbc9d2ch"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.53.0-linux-arm64.tar.gz"; + sha256 = "1lbwp85x9608acz3wx91y68lr73h5bkh1vglji9x7p76rg3nkh2k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.6.0-linux-arm64.tar.gz"; - sha256 = "0i815lp4dlzs6kspbmhv7pipci9pv5fzf44bmp4vv8zk372b2rls"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.7.0-linux-arm64.tar.gz"; + sha256 = "124r9dkpsw87hqj24iwzml9dnm2c5vwqymmxbxa22p6cf82l6p79"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-linux-arm64.tar.gz"; sha256 = "0yjy3i95jsdqwmb7qgixlnhzsr6hiv14jcsydjk9j821zw4xrwpr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.28.0-linux-arm64.tar.gz"; - sha256 = "1y931wca5hppiwxya68rj6ymhavw7kkpqd67awpls6f7j4y0wwjl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.29.0-linux-arm64.tar.gz"; + sha256 = "1nmrz4gfb3wnqyy638y4l4xkr66angjkj5z6n2aj27jhpsgyxy0n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.3-linux-arm64.tar.gz"; sha256 = "0g4s4myx9qyzzpcnq2h1lm0kajwfww2m4nfvnxhlpnhc51yn2j60"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.2-linux-arm64.tar.gz"; - sha256 = "04kg7b2zk06d7zmipy5y9adsk4yd9bsg3bqb13r4m1lfqh604ivn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.3-linux-arm64.tar.gz"; + sha256 = "0ww83x60znn33wnh5f4y23sm847xwvfnbn704kbw3wz61p8hx39b"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-linux-arm64.tar.gz"; @@ -433,12 +433,12 @@ sha256 = "0hj4a0llq088xcfp85k6nn8ssffj51lvhqp05sg8x3kbg6n0dapy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.12.0-linux-arm64.tar.gz"; - sha256 = "13vlh0v6nq7l6rs4pwfzd4v9miqnkxh9hiq8whnaqkxqlayx6h32"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.12.1-linux-arm64.tar.gz"; + sha256 = "0agw84w6rqyfkdkmmk7sbd13bj5wskl501qfa51syligdmiixf7j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.20.0-linux-arm64.tar.gz"; - sha256 = "0yrymzhihv597mbfz88s4xbklsl9jp1g18viabzxc194l323wr2z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.21.0-linux-arm64.tar.gz"; + sha256 = "1hjk5rxklbm607ayp6mqb8x810n09prs20cwj9j19kxynabpdqc1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.28.0-linux-arm64.tar.gz"; @@ -469,8 +469,8 @@ sha256 = "158iqlvxdc38yn2cdifp94v4jmqbybczm98g3fc8n1ny2wr7akny"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.2.0-linux-arm64.tar.gz"; - sha256 = "0rp3gdng2gnskddwlkkglig3dssdvg9x71pq6ab8mhr4afhza4f8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.3.0-linux-arm64.tar.gz"; + sha256 = "1f69biz65rz1s1scyyjhjldqrvkbqz2nhm93q62rzdi9sldjbf08"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz"; @@ -479,36 +479,36 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.60.0-darwin-arm64.tar.gz"; - sha256 = "1afsivafx7f0r85k6z5fg57hj6cv4msfzpjbv61kycsf3glls21i"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.62.0-darwin-arm64.tar.gz"; + sha256 = "1y96acwg1axdm045zy87k3bsfngs4lp41sy9srzwvqfwxp2vbsz3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.0.2-darwin-arm64.tar.gz"; - sha256 = "1y76k8d4jzd0py9cvw3syql22nxajv20c85pl9m26bjhx2vzqk3i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.1.0-darwin-arm64.tar.gz"; + sha256 = "0sj5f6ckfd2y3l680k9r5n67zy5r2nrli7fc5v0zakawwf886wdz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.3.0-darwin-arm64.tar.gz"; sha256 = "0da555h07fzmrg25sw33744cwh678rb231i0w7arpws2r3qdjjwv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.34.0-darwin-arm64.tar.gz"; - sha256 = "1flvldcqqrw39hiyk9vnc98276ayvaij5djnxi4njm1q3rjgg5zp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.35.0-darwin-arm64.tar.gz"; + sha256 = "1w7c8dzyzq73chkz7986gn6nqyk7qmfghbx9k2aa0fw803gqqnfs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.2.0-darwin-arm64.tar.gz"; - sha256 = "0m8kw7wl7jmzx14gk53p5sr5vqrpf00s96ncywgh4l1qdhbwhwa5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.2.1-darwin-arm64.tar.gz"; + sha256 = "1yv20fxzck3rs577p5avwsbcac8d001w43r08rh7s0q7r10mmq8k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.18.0-darwin-arm64.tar.gz"; sha256 = "1p1xyhll66vil1hmszamjn6lspiygxdrzfkrmwknh1z9r14nvhcw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.33.0-darwin-arm64.tar.gz"; - sha256 = "0mqfsqq2x3cz6k2lybpb49qqq6bdzpfvlxcdav739qxzhddq4g6h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.35.0-darwin-arm64.tar.gz"; + sha256 = "13wps5ih64rlif7ps0w7cm2q21fng27b6lp0r55v5j8rada43xn5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.38.0-darwin-arm64.tar.gz"; - sha256 = "11rhr4p5z7shr74yyrsfagqcshn1r8kzv4vp7iqa7jx521h7s0yn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.39.0-darwin-arm64.tar.gz"; + sha256 = "1df0g7kdn518jfgbwm38wsf47ll41lsgmbdq5zcah29whvv5zhyv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.36.0-darwin-arm64.tar.gz"; @@ -535,40 +535,40 @@ sha256 = "1h5pahqhgj8kvagv8wgv1sf4cxk8vs8sinw5q0mlnwa5z0z5hgwj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.1.0-darwin-arm64.tar.gz"; - sha256 = "1nyh8kzvbknpf95l5m3lngmfvq7ngbh892lbbn5zbfkm9qv6way4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.1.2-darwin-arm64.tar.gz"; + sha256 = "1j2vhl06c3zl9gbgqbbkypdzf18rsn087365l4hq7l2y0mhps8kg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v7.1.0-darwin-arm64.tar.gz"; - sha256 = "1ccgr4041rsqrxzgsfm85fh4c8ricvprp3l4gqraslmwgsrxx2z5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v7.2.0-darwin-arm64.tar.gz"; + sha256 = "0074d9q6zby1rki65byl3rndblcq614jmyda5qbc6dmcjb0paqhx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.52.0-darwin-arm64.tar.gz"; - sha256 = "1cmdx19p87ah3rgf1x0hfzpzzr1bwwr5c190cn1xkvs69v4ra4rc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.53.0-darwin-arm64.tar.gz"; + sha256 = "116v7hmwhpr4bhjr4p7837jmbkrb67phml9rq0sgvhp2v73rp5d4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.6.0-darwin-arm64.tar.gz"; - sha256 = "14xbrcvfxqx2w6w03xb0ll2nhmyafgab72c4di602zv1d5jvif3l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.7.0-darwin-arm64.tar.gz"; + sha256 = "0lgc0kjq4p34rg7lv1p4pm8kngd7y60ks2xqv59xr50q9hlc3mg0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-darwin-arm64.tar.gz"; sha256 = "1lkj6zjzhg7s06p75wia14jjsfqs2wza08m4bbcpc4s99b4p6274"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.28.0-darwin-arm64.tar.gz"; - sha256 = "06qv3bmmcrv9rxv5xain2rk2grfqij6czy2nqay07bjpy2awzh40"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.29.0-darwin-arm64.tar.gz"; + sha256 = "0pny34hf9g8n748hdfczf4ik6f01xmp7rmp8ix8rqjhlr7nj8spn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.3-darwin-arm64.tar.gz"; sha256 = "0yi1y22s1mhdrv6kwg94c5yr57jpp456illnaa1kwb3x7rkha9ff"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.2-darwin-arm64.tar.gz"; - sha256 = "1izqf1g2ccsm1wakq7h8nwk7v3gp3q561mp0qkpda90bdkn7abc6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.3-darwin-arm64.tar.gz"; + sha256 = "18pi5bd7n6kq8ddn8djmn80m0n943p4w827ak5ifw04wb0b23a1x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-darwin-arm64.tar.gz"; @@ -591,12 +591,12 @@ sha256 = "1fhll8bgamlv4kljngydmnhbc90bz3figg10qy3qa9kgqkrxm041"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.12.0-darwin-arm64.tar.gz"; - sha256 = "1ig4s67nywazngrc8gwrqacsk8msdw684i1ng6sx7zm05j8bj7rj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.12.1-darwin-arm64.tar.gz"; + sha256 = "1avgkbqqxiwnbxkih8j0h435g18893wmkzbdm0zgzq47w57vjxcx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.20.0-darwin-arm64.tar.gz"; - sha256 = "05rl4f8q0d3rlrxr9fr1sfj6ypc5xmvgzdmsvxd891z26yamx7ig"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.21.0-darwin-arm64.tar.gz"; + sha256 = "048j1iv3389a9alyyv95yhj9gv02wf9blx3l1v3k0w6wy4cdrhwd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.28.0-darwin-arm64.tar.gz"; @@ -627,8 +627,8 @@ sha256 = "1hy2w6x8mr7bi1pkaz4s8881w1nvl1nhrlqmc371xkpfkaahhj25"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.2.0-darwin-arm64.tar.gz"; - sha256 = "1dlf93xbx643kh3np3v8vg3n82rcsc7k90qf2rcqikyyzqqlr886"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.3.0-darwin-arm64.tar.gz"; + sha256 = "1kwiihjb6k89da3kpxl26ayzjizfm3ngxpb9k0rg05qszvc72dh4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz"; From 84077e13db2fee23afd7176f622012ba232bd9ca Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Apr 2023 16:00:23 +0000 Subject: [PATCH 068/169] pkg: 1.19.0 -> 1.19.1 --- pkgs/tools/package-management/pkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/tools/package-management/pkg/default.nix index 232e3e5add2b..9ae44d0435ac 100644 --- a/pkgs/tools/package-management/pkg/default.nix +++ b/pkgs/tools/package-management/pkg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkg"; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "freebsd"; repo = "pkg"; rev = finalAttrs.version; - sha256 = "W66g8kVvaPJSyOZcgyDcUBrWQQ5YDkRqofSWfIsjd+k="; + sha256 = "WHR2evPn4Y0wzGwVUEuYPrDDnuPSsYHr4xIofAHeTJk="; }; setOutputFlags = false; From 2dbdc56a46547e6c257828d5e69048f41ebe4a66 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Apr 2023 16:00:41 +0000 Subject: [PATCH 069/169] pkg: don't use vendored libelf --- pkgs/tools/package-management/pkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/tools/package-management/pkg/default.nix index 9ae44d0435ac..5a67e00363b8 100644 --- a/pkgs/tools/package-management/pkg/default.nix +++ b/pkgs/tools/package-management/pkg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, m4, pkg-config, tcl -, bzip2, libarchive, libbsd, xz, openssl, zlib +, bzip2, elfutils, libarchive, libbsd, xz, openssl, zlib }: stdenv.mkDerivation (finalAttrs: { @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; nativeBuildInputs = [ m4 pkg-config tcl ]; - buildInputs = [ bzip2 libarchive xz openssl zlib ] + buildInputs = [ bzip2 elfutils libarchive openssl xz zlib ] ++ lib.optional stdenv.isLinux libbsd; enableParallelBuilding = true; From dea29666cb3e2b482ed327ec6c7780c25ab6b199 Mon Sep 17 00:00:00 2001 From: "Yestin L. Harrison" Date: Sat, 8 Apr 2023 11:17:12 -0700 Subject: [PATCH 070/169] depotdownloader: unbreak on aarch64-darwin --- pkgs/tools/misc/depotdownloader/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/depotdownloader/default.nix b/pkgs/tools/misc/depotdownloader/default.nix index 1f054fb063a2..ecbe3cc67d2a 100644 --- a/pkgs/tools/misc/depotdownloader/default.nix +++ b/pkgs/tools/misc/depotdownloader/default.nix @@ -25,7 +25,7 @@ buildDotnetModule rec { changelog = "https://github.com/SteamRE/DepotDownloader/releases/tag/DepotDownloader_${version}"; license = licenses.gpl2Only; maintainers = [ maintainers.babbaj ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "DepotDownloader"; }; } From 993f9defe1246cefae13dccf285979f5adbe8943 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Apr 2023 19:58:28 +0200 Subject: [PATCH 071/169] python310Packages.immutabledict: 2.2.3 -> 2.2.4 https://github.com/corenting/immutabledict/blob/v2.2.4/CHANGELOG.md --- pkgs/development/python-modules/immutabledict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix index 8fef0641b1f1..249f789513d2 100644 --- a/pkgs/development/python-modules/immutabledict/default.nix +++ b/pkgs/development/python-modules/immutabledict/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "2.2.3"; + version = "2.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "corenting"; repo = "immutabledict"; rev = "v${version}"; - hash = "sha256-GeQ1BEBt+66YhohyaXt7rIVNpEk6mINwsC3JrmYNjRI="; + hash = "sha256-cykTZw3p6P35rHaJmfmiXIqybc+ZeqUkxneoPot7E9Q="; }; nativeBuildInputs = [ From 398f1d6b14f19f6e37a5b98f252cfd2566c9b7c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Apr 2023 20:14:11 +0200 Subject: [PATCH 072/169] mozphab: 1.1.0 -> 1.4.3 --- pkgs/applications/misc/mozphab/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/mozphab/default.nix b/pkgs/applications/misc/mozphab/default.nix index 82cf9b3d9515..28f1e4b2d98c 100644 --- a/pkgs/applications/misc/mozphab/default.nix +++ b/pkgs/applications/misc/mozphab/default.nix @@ -10,22 +10,30 @@ python3.pkgs.buildPythonApplication rec { pname = "mozphab"; - version = "1.1.0"; - format = "setuptools"; + version = "1.4.3"; + format = "pyproject"; src = fetchFromGitHub { owner = "mozilla-conduit"; repo = "review"; rev = "refs/tags/${version}"; - hash = "sha256-vLHikGjTYOeXd6jDRsoCkq3i0eh6Ttd4KdvlixjzdZ4="; + hash = "sha256-FUHT4MPzSxO3MCNYWodNxvFR2kL0P4eGmSHPtCt0Cug="; }; postPatch = '' - substituteInPlace setup.py \ + substituteInPlace pyproject.toml \ --replace "glean-sdk>=50.0.1,==50.*" "glean-sdk" ''; + nativeBuildInputs = with python3.pkgs; [ + setuptools + setuptools-scm + ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = with python3.pkgs; [ + colorama distro glean-sdk packaging From a599a94d2162217abbf8379941d5e02e3cd1ebbc Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 8 Apr 2023 21:30:24 +0300 Subject: [PATCH 073/169] kde/frameworks: 5.104 -> 5.105 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 664 +++++++++--------- 2 files changed, 333 insertions(+), 333 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 2aa04acc1318..356f5cfa6fe9 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.104/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.105/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index d47c7152f58b..74156efa2031 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/attica-5.104.0.tar.xz"; - sha256 = "0vxlh4qaws64qns13jpf026fxknpscj312vr3vpw8vwq8201qjf3"; - name = "attica-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/attica-5.105.0.tar.xz"; + sha256 = "1f8964vy4i2bmd7vh8fjcly2ya9lfjnd3k4c59x3hps3fk6ly72z"; + name = "attica-5.105.0.tar.xz"; }; }; baloo = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/baloo-5.104.0.tar.xz"; - sha256 = "0akklz0r4pc7dyk7jxf1hh8qz1i6hfvnbi3s0smsznm5f5x1ywls"; - name = "baloo-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/baloo-5.105.0.tar.xz"; + sha256 = "1igln5dfrcqrgh26dblma8pq2rhd4y633f14wz996sdzr8d7wgwd"; + name = "baloo-5.105.0.tar.xz"; }; }; bluez-qt = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/bluez-qt-5.104.0.tar.xz"; - sha256 = "1xg9i1f1jb53a937m7gky1jvglivqp1jf41krs781d5mb9kpw6vh"; - name = "bluez-qt-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/bluez-qt-5.105.0.tar.xz"; + sha256 = "10ym2gs9zdc1724qqzc6vn7p9v6c58mxzgv82ry5qypx98r4kvf6"; + name = "bluez-qt-5.105.0.tar.xz"; }; }; breeze-icons = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/breeze-icons-5.104.0.tar.xz"; - sha256 = "0smfx8r4pmfj2qbk5cfsngyw8psv5sgk4f466z6pl73gzg1sqbgz"; - name = "breeze-icons-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/breeze-icons-5.105.0.tar.xz"; + sha256 = "0yd6v226a7yryp5lc1mma82d7lrpz2ajj4qkzcgcmm59l2fb0a13"; + name = "breeze-icons-5.105.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/extra-cmake-modules-5.104.0.tar.xz"; - sha256 = "1nc5ynfz903jc87xawnww3pf1y73x9jvmxnbrj24nqv6vcgv57p4"; - name = "extra-cmake-modules-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/extra-cmake-modules-5.105.0.tar.xz"; + sha256 = "0nrn667dhqw728c5zmfcyf2h03rx5nbdkii1p3fklalgbypggfsr"; + name = "extra-cmake-modules-5.105.0.tar.xz"; }; }; frameworkintegration = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/frameworkintegration-5.104.0.tar.xz"; - sha256 = "1s5r72ghs0xkk397693j6vvdi8vk5hkni78rrk0h63fw2x2hgj2i"; - name = "frameworkintegration-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/frameworkintegration-5.105.0.tar.xz"; + sha256 = "0wdgk9hlafcld89svvlsnd8j4n0nshzcvb57vyvrvaasa0rpffi5"; + name = "frameworkintegration-5.105.0.tar.xz"; }; }; kactivities = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kactivities-5.104.0.tar.xz"; - sha256 = "0lvrj7q88vgivl0jg2c8kayj9r0zjnpi5l7y87sdwi1sfqjibhr9"; - name = "kactivities-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kactivities-5.105.0.tar.xz"; + sha256 = "1cphdhbarafz7a0ccnr654nja93hjv9xfhwzld9kkl4g50y07m4g"; + name = "kactivities-5.105.0.tar.xz"; }; }; kactivities-stats = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kactivities-stats-5.104.0.tar.xz"; - sha256 = "0hxskcsbplj4s1cdkwhvwpxrinqhyqkmg8kf9dghsybfs6gkb7jf"; - name = "kactivities-stats-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kactivities-stats-5.105.0.tar.xz"; + sha256 = "02j2mpn0b59rqrafssjj8vxrrp6xjrjrqsfsswzdvhhm8yykllff"; + name = "kactivities-stats-5.105.0.tar.xz"; }; }; kapidox = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kapidox-5.104.0.tar.xz"; - sha256 = "0khrk65l1vl8ycghircjln76i2bdlv2xq7yq2pgqqfiaqmgd02c8"; - name = "kapidox-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kapidox-5.105.0.tar.xz"; + sha256 = "09d1abx70wmkpfpy1iq8dyg63i2r2qzxy2v3vmhsdnf92zbf3wb8"; + name = "kapidox-5.105.0.tar.xz"; }; }; karchive = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/karchive-5.104.0.tar.xz"; - sha256 = "0bpx6iankpgssfqiyz8vaz3vrkq2zipxd4h5gn8x46k9d3z3sbxn"; - name = "karchive-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/karchive-5.105.0.tar.xz"; + sha256 = "0jcpva3w3zpxg4a1wk8wbip74pm3cisq3pf7c51ffpsj9k7rbvvp"; + name = "karchive-5.105.0.tar.xz"; }; }; kauth = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kauth-5.104.0.tar.xz"; - sha256 = "07jqgndkvrxdjwya0qlghq79wl28hlsnyad6wlvg3hb6ircqch31"; - name = "kauth-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kauth-5.105.0.tar.xz"; + sha256 = "0cr8djdrw852wrbp22hlqwpywpmizdabc2hf31pj56nal8w0hrhw"; + name = "kauth-5.105.0.tar.xz"; }; }; kbookmarks = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kbookmarks-5.104.0.tar.xz"; - sha256 = "0m33jd30kd214wf4v78rfjfffqbr69y72n9likfcdkrk09cnbrc5"; - name = "kbookmarks-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kbookmarks-5.105.0.tar.xz"; + sha256 = "10x16020kccinac2fcbdlsxlr9nhg8r1i7kw43s3kla8xxdn43yb"; + name = "kbookmarks-5.105.0.tar.xz"; }; }; kcalendarcore = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kcalendarcore-5.104.0.tar.xz"; - sha256 = "0chlr9kazgkiasx18gxckiys1dapvjs0bkyh7yirjmzkgazkf44f"; - name = "kcalendarcore-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kcalendarcore-5.105.0.tar.xz"; + sha256 = "1p5b53py4dzsmck8wvwc4q8k53a7dl1s5v4dvp7j2dr4ngci7lpy"; + name = "kcalendarcore-5.105.0.tar.xz"; }; }; kcmutils = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kcmutils-5.104.0.tar.xz"; - sha256 = "12hns58m4h768nfgspsac6ch0h95si6gf2j2dgr24ia4s241ajvm"; - name = "kcmutils-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kcmutils-5.105.0.tar.xz"; + sha256 = "0a99kgcgbmhc1nb46prffqzv84vgywmslij5lbn4p8j7wlvy8drf"; + name = "kcmutils-5.105.0.tar.xz"; }; }; kcodecs = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kcodecs-5.104.0.tar.xz"; - sha256 = "0swxj2kr37pnwdxsipfii8q02g58lvm9lsh4kflqgfjyhvv0kjby"; - name = "kcodecs-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kcodecs-5.105.0.tar.xz"; + sha256 = "0wp5a177ymnghyxz53rx1vg7by3g0rj2ff5a8wyzmjds9xfwdqy2"; + name = "kcodecs-5.105.0.tar.xz"; }; }; kcompletion = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kcompletion-5.104.0.tar.xz"; - sha256 = "045m5q1mh2c65zj5lb999p5i2ag346rg439gqq2dz0qjhx305vdh"; - name = "kcompletion-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kcompletion-5.105.0.tar.xz"; + sha256 = "10dri1bm6mwc4h75mm7g9p7rr9aq124d73wmawrrvr5lm0ifhxkf"; + name = "kcompletion-5.105.0.tar.xz"; }; }; kconfig = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kconfig-5.104.0.tar.xz"; - sha256 = "0f19xj1a3ra3j93i1zzypqqw55dxjgc6baam2yq3x3p7n2vsdrxq"; - name = "kconfig-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kconfig-5.105.0.tar.xz"; + sha256 = "0lp1c1bsavkf2w9hjcqnn74x2q9rqdna8hx2a1shcfg9l4bgb59y"; + name = "kconfig-5.105.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kconfigwidgets-5.104.0.tar.xz"; - sha256 = "08j5svm9ggrl8akq0w13wlw17cv4d4lvw4ggg26a3j512fw1947b"; - name = "kconfigwidgets-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kconfigwidgets-5.105.0.tar.xz"; + sha256 = "0jnrqki9h5xp93n83hrzpfs554lfjkbq8m8id5xwqzd020w4v3q6"; + name = "kconfigwidgets-5.105.0.tar.xz"; }; }; kcontacts = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kcontacts-5.104.0.tar.xz"; - sha256 = "1jaj73jpdnvcia8q0kzrixpradcv3j9r2hln5mq9r0rssbj66h6m"; - name = "kcontacts-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kcontacts-5.105.0.tar.xz"; + sha256 = "0f5kp982ad0p3syz8kddh3kcjl20112q0lykxli0bvi7acgx3vbd"; + name = "kcontacts-5.105.0.tar.xz"; }; }; kcoreaddons = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kcoreaddons-5.104.0.tar.xz"; - sha256 = "0h2fg77gg4z3my06111whnlmrb2939igwg6c1m406v7dgx50sxpd"; - name = "kcoreaddons-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kcoreaddons-5.105.0.tar.xz"; + sha256 = "18ns7199bk895z3vb8p6jy7ikam917qp0gb4kbkkz5mkbfnd6p4i"; + name = "kcoreaddons-5.105.0.tar.xz"; }; }; kcrash = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kcrash-5.104.0.tar.xz"; - sha256 = "15palx95pkbxf83nn7qalh80whfp7msn4i049zbsjl9fkr7h1mhj"; - name = "kcrash-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kcrash-5.105.0.tar.xz"; + sha256 = "1j7144lslvz8a66106yqvv1jf77ni9gcf8zmm2kp96icjacpf27f"; + name = "kcrash-5.105.0.tar.xz"; }; }; kdav = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kdav-5.104.0.tar.xz"; - sha256 = "0waw2saxlwsf22q3zlwz10vh6wcwabd3i5cbwnhlli2z86l7p2bg"; - name = "kdav-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kdav-5.105.0.tar.xz"; + sha256 = "0dg3if10l406pxmgp1jz1wmxh4sbm5yw2jg0hx1hfckay53pbqix"; + name = "kdav-5.105.0.tar.xz"; }; }; kdbusaddons = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kdbusaddons-5.104.0.tar.xz"; - sha256 = "1d2nzlw069m3m9i2x1rkqd4agssgckl2g7kjd0vvq1y4h42dssjc"; - name = "kdbusaddons-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kdbusaddons-5.105.0.tar.xz"; + sha256 = "1pgybz1ah2dj9ki0i5b8m1q0vgv98zcj6nphvj2k9vw59llpn9as"; + name = "kdbusaddons-5.105.0.tar.xz"; }; }; kdeclarative = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kdeclarative-5.104.0.tar.xz"; - sha256 = "1h76xn6f8wyw3bryxxvj90vah25z3kp2n0rx41gv0j11gsyr99w2"; - name = "kdeclarative-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kdeclarative-5.105.0.tar.xz"; + sha256 = "1r4ajn5pgmkginzk3q6mps7xkag48cq4zccw0dd3zjcvkz32vkj4"; + name = "kdeclarative-5.105.0.tar.xz"; }; }; kded = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kded-5.104.0.tar.xz"; - sha256 = "1by4gakr17cxpl0frcly73szpq95k5d6lgv4qmr5skn468h9g197"; - name = "kded-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kded-5.105.0.tar.xz"; + sha256 = "1ysiv0z39i0msnqm483r5q909kc6d5y62hw02asn1kjhx1p8sn5c"; + name = "kded-5.105.0.tar.xz"; }; }; kdelibs4support = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/portingAids/kdelibs4support-5.104.0.tar.xz"; - sha256 = "1wim766adlxkig7wmpb9jvv6d2navf3n24h9gj8hbkk4721bgalv"; - name = "kdelibs4support-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/portingAids/kdelibs4support-5.105.0.tar.xz"; + sha256 = "1vc7iwngfmfwx942lwyw240szz7vyrym9mnf2k0fwfi93hi52l2d"; + name = "kdelibs4support-5.105.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/portingAids/kdesignerplugin-5.104.0.tar.xz"; - sha256 = "10w1jvr47579azrg1h6bxxy7b6rshpzj5mkxkqynhf3ryd2056xw"; - name = "kdesignerplugin-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/portingAids/kdesignerplugin-5.105.0.tar.xz"; + sha256 = "0rmashvv60kfhl5g50p0jbzn7hrfywq4pdcgmd88ab9biiljwj77"; + name = "kdesignerplugin-5.105.0.tar.xz"; }; }; kdesu = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kdesu-5.104.0.tar.xz"; - sha256 = "1ckfic4zvmn0mab1aklg28f77w23rinpqm8yyx5g10b8dcgyp7i1"; - name = "kdesu-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kdesu-5.105.0.tar.xz"; + sha256 = "0mc60zg7hmw6465d35rxx8vh8d5f5v1yj8zxpscw43n3jgdlv9hj"; + name = "kdesu-5.105.0.tar.xz"; }; }; kdewebkit = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/portingAids/kdewebkit-5.104.0.tar.xz"; - sha256 = "1dl62bf0kxcnwzghbrrrh7p1awjyck41bqg907y49i76hflimqj0"; - name = "kdewebkit-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/portingAids/kdewebkit-5.105.0.tar.xz"; + sha256 = "165nlkk9d6lzmpa1cdp9l5rydl82fs4xafqgilkqv4z1swc0sxiq"; + name = "kdewebkit-5.105.0.tar.xz"; }; }; kdnssd = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kdnssd-5.104.0.tar.xz"; - sha256 = "1zk0rxrm63xdjjspa63smw4x9rsc5sakcxpaiysf265605yma89v"; - name = "kdnssd-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kdnssd-5.105.0.tar.xz"; + sha256 = "1m18g3ya3wy3gmfqfh49vm1nqk0kyvxjwhmrhv3x0rj6b0vxwrf5"; + name = "kdnssd-5.105.0.tar.xz"; }; }; kdoctools = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kdoctools-5.104.0.tar.xz"; - sha256 = "1p243fzm135vbqgdrpj9rah3ywaipsdamgz3add3an4cpk94wnqi"; - name = "kdoctools-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kdoctools-5.105.0.tar.xz"; + sha256 = "08h9idr3rmcay7lgnk6p8gmrm034hd7zp15s3516hijcj5qlnkhv"; + name = "kdoctools-5.105.0.tar.xz"; }; }; kemoticons = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kemoticons-5.104.0.tar.xz"; - sha256 = "1q62jjpyf7sfd45ksb01mpls3vp4bfh58sdp4bk0chnq0nlz6qff"; - name = "kemoticons-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kemoticons-5.105.0.tar.xz"; + sha256 = "0i26qpd3c7sldvcp03w7q7ddhb6rxqk2izwz3kpsxkvh54xvfa60"; + name = "kemoticons-5.105.0.tar.xz"; }; }; kfilemetadata = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kfilemetadata-5.104.0.tar.xz"; - sha256 = "016mdmnykcbgpms6xwxfavkq2cs289626bhpffhsgipf3sg1jkqy"; - name = "kfilemetadata-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kfilemetadata-5.105.0.tar.xz"; + sha256 = "0arfn0hfaplnjchmv9p8m25qbzsz2ai584s7zv57kiwjn6xg4kn6"; + name = "kfilemetadata-5.105.0.tar.xz"; }; }; kglobalaccel = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kglobalaccel-5.104.0.tar.xz"; - sha256 = "1bkyp9x7cf9qp1mn67s7hzxzz7mvafgvdbqrmywrklxl82azilnr"; - name = "kglobalaccel-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kglobalaccel-5.105.0.tar.xz"; + sha256 = "1554zdfwsqcsv6ssip9rx9xnqzirilxqbjaalrzx91kxhpbgic58"; + name = "kglobalaccel-5.105.0.tar.xz"; }; }; kguiaddons = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kguiaddons-5.104.0.tar.xz"; - sha256 = "03c4jcz8q0bn4r9d55f9d94330m1chk934z8x7wzcjk8bgi8v3gv"; - name = "kguiaddons-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kguiaddons-5.105.0.tar.xz"; + sha256 = "1w8slfphzqvdnjaw6vv4fpk1xqd7i9d55bmd6fawcvz9bkh8qcb6"; + name = "kguiaddons-5.105.0.tar.xz"; }; }; kholidays = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kholidays-5.104.0.tar.xz"; - sha256 = "0b98z4psq6b1jl63r821sr327cxgps77l2ngg3d2fp5ns4ly8ks8"; - name = "kholidays-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kholidays-5.105.0.tar.xz"; + sha256 = "02lcl93ppw0i6b91y276fdd61d74dhvsxs95cqm47f9xiqhhra2v"; + name = "kholidays-5.105.0.tar.xz"; }; }; khtml = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/portingAids/khtml-5.104.0.tar.xz"; - sha256 = "0iy4yq83xflbj8l91ki63wk2y08lgw1dxbc1m5nxjr7krrsah6z1"; - name = "khtml-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/portingAids/khtml-5.105.0.tar.xz"; + sha256 = "085r2ay5bs1vypnnlspd3jbavyp581mcrj1p9cd99b4g033iwf0l"; + name = "khtml-5.105.0.tar.xz"; }; }; ki18n = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/ki18n-5.104.0.tar.xz"; - sha256 = "1qafw55ply9k6jhk95s035gr3a1lg56nxdbs5i3zm06652g5p0gy"; - name = "ki18n-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/ki18n-5.105.0.tar.xz"; + sha256 = "0flgjlhgnhnz5a6vn28kmgs5f7w7nxm2gwgqjd931aw8q4gws9ms"; + name = "ki18n-5.105.0.tar.xz"; }; }; kiconthemes = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kiconthemes-5.104.0.tar.xz"; - sha256 = "1pycdidcgixshlhjfxzivh6fgxygs5p24f4qaf5s5nmca3wxkx3h"; - name = "kiconthemes-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kiconthemes-5.105.0.tar.xz"; + sha256 = "1gr37x31y1k06939yrpp4r26zm4y9ial178smjxqrxr3v8sql5qm"; + name = "kiconthemes-5.105.0.tar.xz"; }; }; kidletime = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kidletime-5.104.0.tar.xz"; - sha256 = "0qc032mwd538s0lk6p0zks44jwdh1wdqicgpcw8jlk3rn9xslm4a"; - name = "kidletime-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kidletime-5.105.0.tar.xz"; + sha256 = "0bpv6g882n84swq56lmzmv4zn97jqiz4aivxszs40qicnmy4krlb"; + name = "kidletime-5.105.0.tar.xz"; }; }; kimageformats = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kimageformats-5.104.0.tar.xz"; - sha256 = "0pdl9gap5r5i6hcfx9443iw8f763nn7c9n4b0s9mnxzzmfs2px3r"; - name = "kimageformats-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kimageformats-5.105.0.tar.xz"; + sha256 = "1z6hhympnrl0nmgj085smnxhbxa55zzldqh8i6m51s7r77bym9jf"; + name = "kimageformats-5.105.0.tar.xz"; }; }; kinit = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kinit-5.104.0.tar.xz"; - sha256 = "0d3jpmqylmgcxi7p21ij2nkvgmclkigjcfyypnhfqnzpja8nhy3i"; - name = "kinit-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kinit-5.105.0.tar.xz"; + sha256 = "1knlkqprzggl7gsbvjq453l81dbg3abmyjckhmcc7zwwz59d1p20"; + name = "kinit-5.105.0.tar.xz"; }; }; kio = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kio-5.104.0.tar.xz"; - sha256 = "0473vlk0wpbz4nz2cyv19qkdblg6bdqs96kvrk26yh3jvsjr72ss"; - name = "kio-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kio-5.105.0.tar.xz"; + sha256 = "0zb7p3707sr2pba00b60m07n7b126ypcj8j2yxrqjj6cscai35qz"; + name = "kio-5.105.0.tar.xz"; }; }; kirigami2 = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kirigami2-5.104.0.tar.xz"; - sha256 = "1cfs1fmwxk3sjv75kz42a8w19kdcl3yvqbjncwzwa8qkgdfy8dx0"; - name = "kirigami2-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kirigami2-5.105.0.tar.xz"; + sha256 = "1p45ylh7sl5vxk8vydfw29374xi5v2m7g5vh5qpbigglc8bgxhin"; + name = "kirigami2-5.105.0.tar.xz"; }; }; kitemmodels = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kitemmodels-5.104.0.tar.xz"; - sha256 = "1mqqgddz9ci97zzs5xpj8vihklsxxmf6a4996gil6x30zki2zb0b"; - name = "kitemmodels-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kitemmodels-5.105.0.tar.xz"; + sha256 = "08qmg6iwn7smf0g88qibj2qh407smsvs07wf73iissjgkr1ri1yj"; + name = "kitemmodels-5.105.0.tar.xz"; }; }; kitemviews = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kitemviews-5.104.0.tar.xz"; - sha256 = "1g28bb3qpha2lfmxcjzwjy6fzjmykr71jkn6g7x1jwqqik30v4ll"; - name = "kitemviews-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kitemviews-5.105.0.tar.xz"; + sha256 = "1k9mcaharl1in0jjdk5yfgrmpjdj2z3iznsiic46w5a9660c1ni5"; + name = "kitemviews-5.105.0.tar.xz"; }; }; kjobwidgets = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kjobwidgets-5.104.0.tar.xz"; - sha256 = "18gyp1p2bldyn5l97x0lvqmdl983k7wgw427a5m6c85zscj4299v"; - name = "kjobwidgets-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kjobwidgets-5.105.0.tar.xz"; + sha256 = "1rnygv7nlcdgllfv782w83x1j5wmrdvvpsy4qvclnyyilp7srvdp"; + name = "kjobwidgets-5.105.0.tar.xz"; }; }; kjs = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/portingAids/kjs-5.104.0.tar.xz"; - sha256 = "0dgb8impa7r8pp9q0d7kswy95lpn47b81wwwfz7a6hzsjpqb7mmx"; - name = "kjs-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/portingAids/kjs-5.105.0.tar.xz"; + sha256 = "076kgk3xwx202wr6g9z8y8a41h7yv1a1mi6n4b33h07bghv7vy4k"; + name = "kjs-5.105.0.tar.xz"; }; }; kjsembed = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/portingAids/kjsembed-5.104.0.tar.xz"; - sha256 = "02xisllcg89lnywpnhnhbgk6dfsr1lgh2d58a8yczcn5vm9zh4dh"; - name = "kjsembed-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/portingAids/kjsembed-5.105.0.tar.xz"; + sha256 = "1d933cfjf76db08dai04r5j7vwz5dsl49h6ykb0ljmilccsz52la"; + name = "kjsembed-5.105.0.tar.xz"; }; }; kmediaplayer = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/portingAids/kmediaplayer-5.104.0.tar.xz"; - sha256 = "120avg4a36yzpj8ni5zbrwdwc1p9nzbaw2hbz88w636llv10ymg7"; - name = "kmediaplayer-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/portingAids/kmediaplayer-5.105.0.tar.xz"; + sha256 = "1n2znpn5sxh5a86mqkd2db348fhcybvqwcfy7168g38zflhv1cvx"; + name = "kmediaplayer-5.105.0.tar.xz"; }; }; knewstuff = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/knewstuff-5.104.0.tar.xz"; - sha256 = "0p2a6pqgi25mh9q6v6scxwm73mbqvpvsvlm02vfad1vgflwwz6zq"; - name = "knewstuff-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/knewstuff-5.105.0.tar.xz"; + sha256 = "0zpwym41pagwgh17myw727irjs56gzshz6nb2ib41l1cw6xcnn47"; + name = "knewstuff-5.105.0.tar.xz"; }; }; knotifications = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/knotifications-5.104.0.tar.xz"; - sha256 = "060dqk7jarc8sx133n6chs04igv5f3ag7xxiqxr3xrvzx69h4vf7"; - name = "knotifications-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/knotifications-5.105.0.tar.xz"; + sha256 = "0damhk6pdw31dypzfdfvrf5qm567yg4kjz1cdn7mq15yj8gys91b"; + name = "knotifications-5.105.0.tar.xz"; }; }; knotifyconfig = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/knotifyconfig-5.104.0.tar.xz"; - sha256 = "0a5f5n904c7gn739fs56qbyz8rw50rdd9ijwvsiamdvqcg3z58jd"; - name = "knotifyconfig-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/knotifyconfig-5.105.0.tar.xz"; + sha256 = "1hvpjj5i253jfnyyg469bbd47mhr0mplpnhmbm6hrf4bpy3h1fp2"; + name = "knotifyconfig-5.105.0.tar.xz"; }; }; kpackage = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kpackage-5.104.0.tar.xz"; - sha256 = "1945l5fcxv3k791zgvp00d2bxwh2805vjjmrcngyzlvyprb8la77"; - name = "kpackage-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kpackage-5.105.0.tar.xz"; + sha256 = "0rb798f1p8kk9fj68isw5ryxq2hp9gpj694zbhmkkdnxaralvbnc"; + name = "kpackage-5.105.0.tar.xz"; }; }; kparts = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kparts-5.104.0.tar.xz"; - sha256 = "1k80wx8jk19add3v1bmp1065nczc0cwd6qycj6cnd428ri30d936"; - name = "kparts-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kparts-5.105.0.tar.xz"; + sha256 = "175pjl6wba3g67icfv1wk8dijidmwdnh47j8av8x0xnd1xv3605b"; + name = "kparts-5.105.0.tar.xz"; }; }; kpeople = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kpeople-5.104.0.tar.xz"; - sha256 = "15kc5q54gq01wpyc94r59vxdrv02fngwapshq57adw7aqw8ya2w2"; - name = "kpeople-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kpeople-5.105.0.tar.xz"; + sha256 = "01j71ps6qni42vnvnqh597zd1drvjadss5ay0cgfk6yviia8w2dc"; + name = "kpeople-5.105.0.tar.xz"; }; }; kplotting = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kplotting-5.104.0.tar.xz"; - sha256 = "029z4k76adhzyf7mbwhpilkrzpjj9cj7rz32fvpvl4h5m9q4ryax"; - name = "kplotting-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kplotting-5.105.0.tar.xz"; + sha256 = "02qhvw73qyjkx12mg6lp33fpwwm4z6qbkr965i1w2nzzvwa3bkn9"; + name = "kplotting-5.105.0.tar.xz"; }; }; kpty = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kpty-5.104.0.tar.xz"; - sha256 = "01jmxa80s4dv0a46f8hkfm4sdz59zq0fanq8bj9hpn45jcj2w9dz"; - name = "kpty-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kpty-5.105.0.tar.xz"; + sha256 = "0sk1s3gqzxd5kh7wz7lcr9yjgkzrw90f1hqrc696x2v7p70ylb5s"; + name = "kpty-5.105.0.tar.xz"; }; }; kquickcharts = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kquickcharts-5.104.0.tar.xz"; - sha256 = "09g3hjfmzpqflkc1winlavwrjy41zq3rbcndiy210g688n2i5l6r"; - name = "kquickcharts-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kquickcharts-5.105.0.tar.xz"; + sha256 = "00y9na28c3qs1qv7ifkpsr0rvz2m2bskqknnqijlxmz3rc5hh94a"; + name = "kquickcharts-5.105.0.tar.xz"; }; }; kross = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/portingAids/kross-5.104.0.tar.xz"; - sha256 = "04pyw1gy6swr86papghgi9l9gxc9qw5bwirrcxmw7ic6cga1ap3v"; - name = "kross-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/portingAids/kross-5.105.0.tar.xz"; + sha256 = "1yip8d1zjzf40g0xni856zg085rswd5i50myr97czmwnfb41wjz5"; + name = "kross-5.105.0.tar.xz"; }; }; krunner = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/krunner-5.104.0.tar.xz"; - sha256 = "193q5hrcffxh99ms06qfrkmxc4h56qacgqfzimdq1smnwplnjwjs"; - name = "krunner-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/krunner-5.105.0.tar.xz"; + sha256 = "025gdmdx67zblqziab43q6cj6jcvacrgc7raz335455n5k88lnvq"; + name = "krunner-5.105.0.tar.xz"; }; }; kservice = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kservice-5.104.0.tar.xz"; - sha256 = "18yqi975nd5g6kfys23p28kchn6sp74x7fsagkwi0npa72bi0nr1"; - name = "kservice-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kservice-5.105.0.tar.xz"; + sha256 = "0367wc12cyr4l96r0plvsxig49iz77kh2s89xnhg8h20jm00j0di"; + name = "kservice-5.105.0.tar.xz"; }; }; ktexteditor = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/ktexteditor-5.104.0.tar.xz"; - sha256 = "1rjizg18d3c2qs5jr9zr35c335sb8p6c8czqwyrrv4zhzdvivq9c"; - name = "ktexteditor-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/ktexteditor-5.105.0.tar.xz"; + sha256 = "01jiv0zxk8swck1vdlg84599v2qk6vf9ci4vjgyg19jrkb1dxscn"; + name = "ktexteditor-5.105.0.tar.xz"; }; }; ktextwidgets = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/ktextwidgets-5.104.0.tar.xz"; - sha256 = "1skxw7i2wdjz5r5v93cqlj4ngr1l8lzjql6fl0ki4jx5x35jizj8"; - name = "ktextwidgets-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/ktextwidgets-5.105.0.tar.xz"; + sha256 = "1zb8drbxsmkaqd8yx8d9lyv5g6im8c0qfpl5b91w63pg8havapqf"; + name = "ktextwidgets-5.105.0.tar.xz"; }; }; kunitconversion = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kunitconversion-5.104.0.tar.xz"; - sha256 = "1a6p3rmyywjjpiap4k7bvqh1f2h3pgbccq5jz21s4swk06k8762h"; - name = "kunitconversion-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kunitconversion-5.105.0.tar.xz"; + sha256 = "0khlhr0ahhdgxlah2f2hclqb1q99nkpkvm6akz30vgxyh5a58s9z"; + name = "kunitconversion-5.105.0.tar.xz"; }; }; kwallet = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kwallet-5.104.0.tar.xz"; - sha256 = "1d9v786g6729j0nbaqi6hwkd16vcyxi5ggi7m6yp7rfayh5l4n30"; - name = "kwallet-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kwallet-5.105.0.tar.xz"; + sha256 = "1ycy4hi1blq2nmwcbmn1md09g9f1s98z2vymdbpwlhcc74kizsqd"; + name = "kwallet-5.105.0.tar.xz"; }; }; kwayland = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kwayland-5.104.0.tar.xz"; - sha256 = "0xp0py9z3jqh1lg03rqcrz919a5l3cxkp3fg9bpvmkc5iql61sq5"; - name = "kwayland-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kwayland-5.105.0.tar.xz"; + sha256 = "13ila8daymsninh5bcx2ynglrcglsls4pg8cp281cm20q56y4z81"; + name = "kwayland-5.105.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kwidgetsaddons-5.104.0.tar.xz"; - sha256 = "081i2awi4xx9wi576n123ivwkqhjf75811qd0z91mra3rm9bbfsa"; - name = "kwidgetsaddons-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kwidgetsaddons-5.105.0.tar.xz"; + sha256 = "07kzdafxzmcbrk5w1mk91amndp7xbqs1hp192pk9w2vrvkgckj5d"; + name = "kwidgetsaddons-5.105.0.tar.xz"; }; }; kwindowsystem = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kwindowsystem-5.104.0.tar.xz"; - sha256 = "06pqda7f6ccyhiakw8y8d60iz09hkn9784xadgyjszdv9qsyw43b"; - name = "kwindowsystem-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kwindowsystem-5.105.0.tar.xz"; + sha256 = "0jplls821dr16wf194yfd07yqfs9m1hzwpfb3qmcwj53vlp07y20"; + name = "kwindowsystem-5.105.0.tar.xz"; }; }; kxmlgui = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/kxmlgui-5.104.0.tar.xz"; - sha256 = "1rlkghydps36223clfp0xqd3apnqqwkhqwp4q6bh3jmk25a5lpgl"; - name = "kxmlgui-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/kxmlgui-5.105.0.tar.xz"; + sha256 = "0s2g3d6hxaqfxj89bv8wlknklg6kx6cya6sgpycq6wj7saz9lyy1"; + name = "kxmlgui-5.105.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/portingAids/kxmlrpcclient-5.104.0.tar.xz"; - sha256 = "1df3pr2ai1xqc9b5byy19gxy6sav08sykazks5mdcyy5v1zsraci"; - name = "kxmlrpcclient-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/portingAids/kxmlrpcclient-5.105.0.tar.xz"; + sha256 = "1l1ckiyqfrqq5q79p87mrmvyba04mvi8snjaamppqfw7mxpdx3ap"; + name = "kxmlrpcclient-5.105.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/modemmanager-qt-5.104.0.tar.xz"; - sha256 = "0v9bk5p6j47nps0walsbh1f71nm8vm3j7p7hf9klfdjxjbc8rzkv"; - name = "modemmanager-qt-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/modemmanager-qt-5.105.0.tar.xz"; + sha256 = "1r2wzrp0lvdcrqmnp8yrq420gjfhd63yj1nlwg2ic0mpcsnnzcjw"; + name = "modemmanager-qt-5.105.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/networkmanager-qt-5.104.0.tar.xz"; - sha256 = "1263l7i2yh2nsmmcfn7qgmhj1zpwvmykxj2zhrqcwx7mxg7xfaqa"; - name = "networkmanager-qt-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/networkmanager-qt-5.105.0.tar.xz"; + sha256 = "1hqlra2ldxscxlprpssc7jhdxvwavk5l55v3drlkfn4l7m54vxxx"; + name = "networkmanager-qt-5.105.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/oxygen-icons5-5.104.0.tar.xz"; - sha256 = "1s66m4vd7r2b4wf1zw7w84za7v56hilfcww7mxwkzcc8nf4iwpq5"; - name = "oxygen-icons5-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/oxygen-icons5-5.105.0.tar.xz"; + sha256 = "0j9vq5xgkyz1arns31g6zicjzf6w3lh7mf94kzkv3x39d488nml2"; + name = "oxygen-icons5-5.105.0.tar.xz"; }; }; plasma-framework = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/plasma-framework-5.104.0.tar.xz"; - sha256 = "0ny5h2jirwdvvfvwr9ak8ri0fq4482wbi9sfkffhfh603lgdafzs"; - name = "plasma-framework-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/plasma-framework-5.105.0.tar.xz"; + sha256 = "19rw4hkhyb4i98pjswrhs7hvac2bm5a0ba6r8ni9da1ykf77f4ak"; + name = "plasma-framework-5.105.0.tar.xz"; }; }; prison = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/prison-5.104.0.tar.xz"; - sha256 = "1f7nh433p1ww1vx9pbr9v9w2hg4hkbhah215afnslfxazcxsr09c"; - name = "prison-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/prison-5.105.0.tar.xz"; + sha256 = "0qa2g1k8jwyixxknxx3fxjxnhwzyjvsqc0j59vkk6ynzhmhfq1bf"; + name = "prison-5.105.0.tar.xz"; }; }; purpose = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/purpose-5.104.0.tar.xz"; - sha256 = "1h9f7znx0azhwc6ajnj2x7gqxkd0qcz5kcfwwx80yx6if07rlvh8"; - name = "purpose-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/purpose-5.105.0.tar.xz"; + sha256 = "05jg22cgcm4isvh7s27glnajqzsxr2n0q3594f9nr2x19rfwm7xq"; + name = "purpose-5.105.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/qqc2-desktop-style-5.104.0.tar.xz"; - sha256 = "1g7yqjg1dxgygb3nryb61648frlyd1h75yrmq78dvdc51agywwls"; - name = "qqc2-desktop-style-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/qqc2-desktop-style-5.105.0.tar.xz"; + sha256 = "14hs28jhsanjirk4hq4bbdl6y7kr9bc723x2zvncmwlsda5nr3yy"; + name = "qqc2-desktop-style-5.105.0.tar.xz"; }; }; solid = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/solid-5.104.0.tar.xz"; - sha256 = "1ks3q4wfrnw7ppsja75qwjsfwdm7h5vbv4lnbg1zxjmlf6y376ia"; - name = "solid-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/solid-5.105.0.tar.xz"; + sha256 = "1dda55kbrqww403z9nfhfqvdidh3ajr0m2pqdzs080h6w475rkgx"; + name = "solid-5.105.0.tar.xz"; }; }; sonnet = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/sonnet-5.104.0.tar.xz"; - sha256 = "0lxrq3jjs1wl7j1gpj1zxs8jygqlscsv2vbr8n3jzb7ly18nw9qp"; - name = "sonnet-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/sonnet-5.105.0.tar.xz"; + sha256 = "13z0014jkiqs1iaxipbvxwciq7l12v327q82v5sijcpjlwnnmvr8"; + name = "sonnet-5.105.0.tar.xz"; }; }; syndication = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/syndication-5.104.0.tar.xz"; - sha256 = "0ldz4ln4ibia09zjvvkwl9jijyd8hsf8wj65yh5iypa9qc7ddccb"; - name = "syndication-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/syndication-5.105.0.tar.xz"; + sha256 = "1qy52hvpjyxv8d3x1bg30cn6b5icc3ik7693asc0d8v98l4nyqkb"; + name = "syndication-5.105.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/syntax-highlighting-5.104.0.tar.xz"; - sha256 = "0ifdjmirp5qw6ggw7xwygz8ayl0c5vkiy4qa0gc93nq4ky20i382"; - name = "syntax-highlighting-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/syntax-highlighting-5.105.0.tar.xz"; + sha256 = "0k0is04mgyw6v3a40i6kvk6vfzmapzmrn7kh6gpiz4ar6chbhn7m"; + name = "syntax-highlighting-5.105.0.tar.xz"; }; }; threadweaver = { - version = "5.104.0"; + version = "5.105.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.104/threadweaver-5.104.0.tar.xz"; - sha256 = "0ix616k2527y5wmzykdf2v6h16jk2frgspjqxc308y6gy3yyqgcn"; - name = "threadweaver-5.104.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.105/threadweaver-5.105.0.tar.xz"; + sha256 = "1qc6a6ak3sy2jinrg5zhpj6s2mxnc98dnhj36ygcyh6cpl5lmilp"; + name = "threadweaver-5.105.0.tar.xz"; }; }; } From 47cf37532515868f73eb73b8fbfdd67c7a48a1f3 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 8 Apr 2023 22:35:15 +0300 Subject: [PATCH 074/169] kiconthemes: drop merged patch --- .../libraries/kde-frameworks/kiconthemes/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index 564e3ae25371..f807193718d5 100644 --- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchpatch, + mkDerivation, extra-cmake-modules, breeze-icons, karchive, kcoreaddons, kconfigwidgets, ki18n, kitemviews, qtbase, qtsvg, qttools, @@ -9,12 +9,6 @@ mkDerivation { pname = "kiconthemes"; patches = [ ./default-theme-breeze.patch - - # fix compile error - (fetchpatch { - url = "https://invent.kde.org/frameworks/kiconthemes/-/commit/d5d04e3c3fa92fbfd95eced39c3e272b8980563d.patch"; - hash = "sha256-8YGWJg7+LrPpezW8ubObcFovI5DCVn3gbdH7KDdEeQw="; - }) ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ From 4c96ce207a1894a2f2fe65d55717e4092ac45657 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 8 Apr 2023 22:04:56 +0200 Subject: [PATCH 075/169] orchis-theme: 2023-03-18 -> 2024-04-08 https://github.com/vinceliuice/Orchis-theme/releases/tag/2024-04-08 --- pkgs/data/themes/orchis-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index 442701890859..0c51dd04149b 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -26,13 +26,13 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-03-18"; + version = "2024-04-08"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - hash = "sha256-ixVHQRJXoXuPEsrbWOVMC/qdF3szpxYzC/8kKe47Bs8="; + hash = "sha256-1Yatb5BeRLu4kWm+EAiRYPvGxRNeIo63SAN3/Dp7Na8="; }; nativeBuildInputs = [ gtk3 sassc ]; From 615c0d9b220326405fe4fccd827f0c2495041c7c Mon Sep 17 00:00:00 2001 From: betaboon Date: Sat, 8 Apr 2023 15:02:45 +0200 Subject: [PATCH 076/169] v4l2-relayd: remove dependency to icamerasrc --- .../os-specific/linux/v4l2-relayd/default.nix | 42 ++----------------- pkgs/top-level/all-packages.nix | 7 +--- 2 files changed, 5 insertions(+), 44 deletions(-) diff --git a/pkgs/os-specific/linux/v4l2-relayd/default.nix b/pkgs/os-specific/linux/v4l2-relayd/default.nix index 293210fa9f57..a089ce8c77f8 100644 --- a/pkgs/os-specific/linux/v4l2-relayd/default.nix +++ b/pkgs/os-specific/linux/v4l2-relayd/default.nix @@ -2,27 +2,14 @@ , stdenv , fetchgit , autoreconfHook -, coreutils , glib -, gnugrep , gst_all_1 -, icamerasrc , libtool -, makeWrapper , pkg-config , which }: -let - gst = [ - gst_all_1.gstreamer.out - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - icamerasrc - ]; -in stdenv.mkDerivation rec { - pname = "v4l2-relayd-${icamerasrc.ipuVersion}"; + pname = "v4l2-relayd"; version = "0.1.3"; src = fetchgit { @@ -38,39 +25,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libtool - makeWrapper pkg-config which ]; buildInputs = [ glib - ] ++ gst; + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]; preConfigure = "./autogen.sh --prefix=$out"; - postInstall = '' - mkdir -p $out/lib/systemd/system $out/etc/default - cp data/systemd/v4l2-relayd.service $out/lib/systemd/system - cp data/etc/default/v4l2-relayd $out/etc/default - - substituteInPlace $out/lib/systemd/system/v4l2-relayd.service \ - --replace grep ${gnugrep}/bin/grep \ - --replace cut ${coreutils}/bin/cut \ - --replace /usr/bin/test ${coreutils}/bin/test \ - --replace /usr/bin/v4l2-relayd $out/bin/v4l2-relayd \ - --replace /etc/default $out/etc/default \ - --replace "DeviceAllow=char-video4linux" "" - - substituteInPlace $out/etc/default/v4l2-relayd \ - --replace 'FORMAT=YUY2' 'FORMAT=NV12' \ - --replace 'CARD_LABEL="Virtual Camera"' 'CARD_LABEL="Intel MIPI Camera"' \ - --replace 'VIDEOSRC="videotestsrc"' 'VIDEOSRC="icamerasrc"' - - wrapProgram $out/bin/v4l2-relayd \ - --prefix GST_PLUGIN_PATH : ${lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gst} - ''; - meta = with lib; { description = "Streaming relay for v4l2loopback using GStreamer"; homepage = "https://git.launchpad.net/v4l2-relayd"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f0487330181..267bba6c434f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27426,12 +27426,7 @@ with pkgs; v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; - v4l2-relayd-ipu6 = callPackage ../os-specific/linux/v4l2-relayd { - icamerasrc = gst_all_1.icamerasrc-ipu6; - }; - v4l2-relayd-ipu6ep = callPackage ../os-specific/linux/v4l2-relayd { - icamerasrc = gst_all_1.icamerasrc-ipu6ep; - }; + v4l2-relayd = callPackage ../os-specific/linux/v4l2-relayd { }; vendir = callPackage ../development/tools/vendir { }; From cb9c4a59f9ab153a57c8a9d1c53936020d26d7f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Apr 2023 22:34:36 +0200 Subject: [PATCH 077/169] exploitdb: 2023-04-07 -> 2023-04-08 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-04-07...2023-04-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 7956d01f8b20..be749febae75 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-04-07"; + version = "2023-04-08"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PcrnqlbhoE9clYCsGX6ttMr92a+2BhuDP8aT6wG9aN0="; + hash = "sha256-dleCqYSfmp0XU1UbX/HSq7EbwTcUcr6PbsTEri72Hoo="; }; nativeBuildInputs = [ From 5da97c87a82248b4cabf2e53638b63508c94de36 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Apr 2023 23:12:22 +0200 Subject: [PATCH 078/169] nats-top: 0.5.3 -> 0.6.0 Diff: https://github.com/nats-io/nats-top/compare/v0.5.3...v0.6.0 --- pkgs/tools/system/nats-top/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/nats-top/default.nix b/pkgs/tools/system/nats-top/default.nix index f394f54ff39e..5df0ffd3cae7 100644 --- a/pkgs/tools/system/nats-top/default.nix +++ b/pkgs/tools/system/nats-top/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nats-top"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G2rUN+eFYWz78xDJcwYVtooTtNSNWR2nUTzar5ztWwE="; + sha256 = "sha256-ZSPv4meyIYqNJm6SvqnpOjTtRGvfkUOAxn3JHmK5UEQ="; }; - vendorSha256 = "sha256-UOy3kyKtOXADdyoZ2rVgIQEOPs2oPBkMTYXxfQzVFmc="; + vendorSha256 = "sha256-8UcHRFt/O8RgZRxODIJZ16zvBi7FmadYdA/NUH9kfEo="; meta = with lib; { description = "top-like tool for monitoring NATS servers"; From 2669f6d35402ccf898b4e5772a26ddd128203621 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Apr 2023 23:16:06 +0200 Subject: [PATCH 079/169] nats-top: add changelog to meta --- pkgs/tools/system/nats-top/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/nats-top/default.nix b/pkgs/tools/system/nats-top/default.nix index 5df0ffd3cae7..1ea9d236942a 100644 --- a/pkgs/tools/system/nats-top/default.nix +++ b/pkgs/tools/system/nats-top/default.nix @@ -10,15 +10,16 @@ buildGoModule rec { src = fetchFromGitHub { owner = "nats-io"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-ZSPv4meyIYqNJm6SvqnpOjTtRGvfkUOAxn3JHmK5UEQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-ZSPv4meyIYqNJm6SvqnpOjTtRGvfkUOAxn3JHmK5UEQ="; }; - vendorSha256 = "sha256-8UcHRFt/O8RgZRxODIJZ16zvBi7FmadYdA/NUH9kfEo="; + vendorHash = "sha256-8UcHRFt/O8RgZRxODIJZ16zvBi7FmadYdA/NUH9kfEo="; meta = with lib; { description = "top-like tool for monitoring NATS servers"; homepage = "https://github.com/nats-io/nats-top"; + changelog = "https://github.com/nats-io/nats-top/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 608f3a1885dfb10561b4eb049d599523ffe12282 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 00:01:23 +0200 Subject: [PATCH 080/169] cpuid: 20230228 -> 20230406 --- pkgs/os-specific/linux/cpuid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index 68c058789bbb..57b03ba8bdb0 100644 --- a/pkgs/os-specific/linux/cpuid/default.nix +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20230228"; + version = "20230406"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-EYLFnFqpp7ljNzlABgQ+YN7hQIh6DBeERm1dLAhH7fM="; + sha256 = "sha256-9ARd5TXzDjTowBKwVM5m9ArDmRRNbjw4lr2AwN7u8bA="; }; # For pod2man during the build process. From dd33a7a9b9a926eca452e1f19e2945f6a59ecbc8 Mon Sep 17 00:00:00 2001 From: betaboon Date: Sat, 8 Apr 2023 15:06:22 +0200 Subject: [PATCH 081/169] nixos/v4l2-relayd: init --- .../manual/release-notes/rl-2305.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/video/v4l2-relayd.nix | 199 ++++++++++++++++++ 3 files changed, 202 insertions(+) create mode 100644 nixos/modules/services/video/v4l2-relayd.nix diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index f5082bf226d7..3b8aea9d1cc0 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -101,6 +101,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [ReGreet](https://github.com/rharish101/ReGreet), a clean and customizable greeter for greetd. Available as [programs.regreet](#opt-programs.regreet.enable). +- [v4l2-relayd](https://git.launchpad.net/v4l2-relayd), a streaming relay for v4l2loopback using gstreamer. Available as [services.v4l2-relayd](#opt-services.v4l2-relayd.instances._name_.enable). + ## Backward Incompatibilities {#sec-release-23.05-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ed6c12197668..a8f9cf674930 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1130,6 +1130,7 @@ ./services/video/replay-sorcery.nix ./services/video/rtsp-simple-server.nix ./services/video/unifi-video.nix + ./services/video/v4l2-relayd.nix ./services/wayland/cage.nix ./services/web-apps/akkoma.nix ./services/web-apps/alps.nix diff --git a/nixos/modules/services/video/v4l2-relayd.nix b/nixos/modules/services/video/v4l2-relayd.nix new file mode 100644 index 000000000000..2a9dbe00158f --- /dev/null +++ b/nixos/modules/services/video/v4l2-relayd.nix @@ -0,0 +1,199 @@ +{ config, lib, pkgs, utils, ... }: +let + + inherit (lib) attrValues concatStringsSep filterAttrs length listToAttrs literalExpression + makeSearchPathOutput mkEnableOption mkIf mkOption nameValuePair optionals types; + inherit (utils) escapeSystemdPath; + + cfg = config.services.v4l2-relayd; + + kernelPackages = config.boot.kernelPackages; + + gst = (with pkgs.gst_all_1; [ + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gstreamer.out + ]); + + instanceOpts = { name, ... }: { + options = { + enable = mkEnableOption (lib.mdDoc "this v4l2-relayd instance"); + + name = mkOption { + type = types.str; + default = name; + description = lib.mdDoc '' + The name of the instance. + ''; + }; + + cardLabel = mkOption { + type = types.str; + description = lib.mdDoc '' + The name the camera will show up as. + ''; + }; + + extraPackages = mkOption { + type = with types; listOf package; + default = [ ]; + description = lib.mdDoc '' + Extra packages to add to {env}`GST_PLUGIN_PATH` for the instance. + ''; + }; + + input = { + pipeline = mkOption { + type = types.str; + description = lib.mdDoc '' + The gstreamer-pipeline to use for the input-stream. + ''; + }; + + format = mkOption { + type = types.str; + default = "YUY2"; + description = lib.mdDoc '' + The video-format to read from input-stream. + ''; + }; + + width = mkOption { + type = types.ints.positive; + default = 1280; + description = lib.mdDoc '' + The width to read from input-stream. + ''; + }; + + height = mkOption { + type = types.ints.positive; + default = 720; + description = lib.mdDoc '' + The height to read from input-stream. + ''; + }; + + framerate = mkOption { + type = types.ints.positive; + default = 30; + description = lib.mdDoc '' + The framerate to read from input-stream. + ''; + }; + }; + + output = { + format = mkOption { + type = types.str; + default = "YUY2"; + description = lib.mdDoc '' + The video-format to write to output-stream. + ''; + }; + }; + + }; + }; + +in +{ + + options.services.v4l2-relayd = { + + instances = mkOption { + type = with types; attrsOf (submodule instanceOpts); + default = { }; + example = literalExpression '' + { + example = { + cardLabel = "Example card"; + input.pipeline = "videotestsrc"; + }; + } + ''; + description = lib.mdDoc '' + v4l2-relayd instances to be created. + ''; + }; + + }; + + config = + let + + mkInstanceService = instance: { + description = "Streaming relay for v4l2loopback using GStreamer"; + + after = [ "modprobe@v4l2loopback.service" "systemd-logind.service" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + Restart = "always"; + PrivateNetwork = true; + PrivateTmp = true; + LimitNPROC = 1; + }; + + environment = { + GST_PLUGIN_PATH = makeSearchPathOutput "lib" "lib/gstreamer-1.0" (gst ++ instance.extraPackages); + V4L2_DEVICE_FILE = "/run/v4l2-relayd-${instance.name}/device"; + }; + + script = + let + appsrcOptions = concatStringsSep "," [ + "caps=video/x-raw" + "format=${instance.input.format}" + "width=${toString instance.input.width}" + "height=${toString instance.input.height}" + "framerate=${toString instance.input.framerate}/1" + ]; + + outputPipeline = [ + "appsrc name=appsrc ${appsrcOptions}" + "videoconvert" + ] ++ optionals (instance.input.format != instance.output.format) [ + "video/x-raw,format=${instance.output.format}" + "queue" + ] ++ [ "v4l2sink name=v4l2sink device=$(cat $V4L2_DEVICE_FILE)" ]; + in + '' + exec ${pkgs.v4l2-relayd}/bin/v4l2-relayd -i "${instance.input.pipeline}" -o "${concatStringsSep " ! " outputPipeline}" + ''; + + preStart = '' + mkdir -p $(dirname $V4L2_DEVICE_FILE) + ${kernelPackages.v4l2loopback.bin}/bin/v4l2loopback-ctl add -x 1 -n "${instance.cardLabel}" > $V4L2_DEVICE_FILE + ''; + + postStop = '' + ${kernelPackages.v4l2loopback.bin}/bin/v4l2loopback-ctl delete $(cat $V4L2_DEVICE_FILE) + rm -rf $(dirname $V4L2_DEVICE_FILE) + ''; + }; + + mkInstanceServices = instances: listToAttrs (map + (instance: + nameValuePair "v4l2-relayd-${escapeSystemdPath instance.name}" (mkInstanceService instance) + ) + instances); + + enabledInstances = attrValues (filterAttrs (n: v: v.enable) cfg.instances); + + in + { + + boot = mkIf ((length enabledInstances) > 0) { + extraModulePackages = [ kernelPackages.v4l2loopback ]; + kernelModules = [ "v4l2loopback" ]; + }; + + systemd.services = mkInstanceServices enabledInstances; + + }; + + meta.maintainers = with lib.maintainers; [ betaboon ]; +} From e4e00d22bfb585a5d8abd0729c1f7ceeb2d85786 Mon Sep 17 00:00:00 2001 From: betaboon Date: Sat, 8 Apr 2023 15:04:47 +0200 Subject: [PATCH 082/169] nixos/hardware/ipu6: init --- .../manual/release-notes/rl-2305.section.md | 2 + nixos/modules/hardware/video/webcam/ipu6.nix | 57 +++++++++++++++++++ nixos/modules/module-list.nix | 1 + 3 files changed, 60 insertions(+) create mode 100644 nixos/modules/hardware/video/webcam/ipu6.nix diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 3b8aea9d1cc0..c2c9f2d1a251 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -103,6 +103,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [v4l2-relayd](https://git.launchpad.net/v4l2-relayd), a streaming relay for v4l2loopback using gstreamer. Available as [services.v4l2-relayd](#opt-services.v4l2-relayd.instances._name_.enable). +- [hardware.ipu6](#opt-hardware.ipu6.enable) adds support for ipu6 based webcams on intel tiger lake and alder lake. + ## Backward Incompatibilities {#sec-release-23.05-incompatibilities} diff --git a/nixos/modules/hardware/video/webcam/ipu6.nix b/nixos/modules/hardware/video/webcam/ipu6.nix new file mode 100644 index 000000000000..8a9b88f9e550 --- /dev/null +++ b/nixos/modules/hardware/video/webcam/ipu6.nix @@ -0,0 +1,57 @@ +{ config, lib, pkgs, ... }: +let + + inherit (lib) mkDefault mkEnableOption mkIf mkOption optional types; + + cfg = config.hardware.ipu6; + +in +{ + + options.hardware.ipu6 = { + + enable = mkEnableOption (lib.mdDoc "ipu6 kernel module"); + + platform = mkOption { + type = types.enum [ "ipu6" "ipu6ep" ]; + description = lib.mdDoc '' + Choose the version for your hardware platform. + + Use `ipu6` for Tiger Lake and `ipu6ep` for Alder Lake respectively. + ''; + }; + + }; + + config = mkIf cfg.enable { + + boot.extraModulePackages = with config.boot.kernelPackages; [ + ipu6-drivers + ]; + + hardware.firmware = with pkgs; [ ] + ++ optional (cfg.platform == "ipu6") ipu6-camera-bin + ++ optional (cfg.platform == "ipu6ep") ipu6ep-camera-bin; + + services.udev.extraRules = '' + SUBSYSTEM=="intel-ipu6-psys", MODE="0660", GROUP="video" + ''; + + services.v4l2-relayd.instances.ipu6 = { + enable = mkDefault true; + + cardLabel = mkDefault "Intel MIPI Camera"; + + extraPackages = with pkgs.gst_all_1; [ ] + ++ optional (cfg.platform == "ipu6") icamerasrc-ipu6 + ++ optional (cfg.platform == "ipu6ep") icamerasrc-ipu6ep; + + input = { + pipeline = "icamerasrc"; + format = mkIf (cfg.platform == "ipu6ep") (mkDefault "NV12"); + }; + }; + + }; + +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a8f9cf674930..cc464c18ca55 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -99,6 +99,7 @@ ./hardware/video/switcheroo-control.nix ./hardware/video/uvcvideo/default.nix ./hardware/video/webcam/facetimehd.nix + ./hardware/video/webcam/ipu6.nix ./hardware/wooting.nix ./hardware/xone.nix ./hardware/xpadneo.nix From 4bdd70bbdb21ab97e376f06193b1ad0474628df4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 9 Apr 2023 08:56:28 +1000 Subject: [PATCH 083/169] gdu: 5.22.0 -> 5.23.0 Diff: https://github.com/dundee/gdu/compare/refs/tags/v5.22.0...v5.23.0 Changelog: https://github.com/dundee/gdu/releases/tag/v5.23.0 --- pkgs/tools/system/gdu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 21691b0d4472..01c225271382 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "gdu"; - version = "5.22.0"; + version = "5.23.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bWeMZ1tQkJsRJbolZBue9UzM4Qs7K5Rj5Z80Uotyb8I="; + hash = "sha256-Uv5wPEGmd2+LVZoSw/K24F3czyjGi6ysQsNtq87p4fg="; }; - vendorHash = "sha256-UP6IdJLc93gRP4vwKKOJl3sNt4sOFeYXjvwk8QM+D48="; + vendorHash = "sha256-BQOlp2mjycOSB0qjLuVNo3+n0xqb77IMizUY6Sz94PM="; nativeBuildInputs = [ installShellFiles From 6e5ce485536b190b76992a25e99f197844dbd3b0 Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Thu, 6 Apr 2023 17:29:17 +0100 Subject: [PATCH 084/169] cloudlog: 2.4 -> 2.4.1 --- pkgs/applications/radio/cloudlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index 76c18839bff7..9f303dc7b518 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.4"; + version = "2.4.1"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - sha256 = "sha256-aF1f6EmlcUgZOkHJgrW6P923QW56vWMH8CZ4cnYiiSk="; + sha256 = "sha256-tFerQJhe/FemtOaP56b2XhLtXH2a8CRT2E69v/77Qz0="; }; postPath = '' From 00ae7d13b82ae7a6827eeab42b29589e556181fc Mon Sep 17 00:00:00 2001 From: Iztok Fister Jr Date: Sun, 9 Apr 2023 02:32:55 +0200 Subject: [PATCH 085/169] python310Packages.niaclass: init at 0.1.3 (#214734) Co-authored-by: Sandro --- .../python-modules/niaclass/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/niaclass/default.nix diff --git a/pkgs/development/python-modules/niaclass/default.nix b/pkgs/development/python-modules/niaclass/default.nix new file mode 100644 index 000000000000..749c49aba30e --- /dev/null +++ b/pkgs/development/python-modules/niaclass/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, niapy +, numpy +, pandas +, poetry-core +, scikit-learn +, toml-adapt +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "niaclass"; + version = "0.1.3"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "lukapecnik"; + repo = "NiaClass"; + rev = version; + sha256 = "sha256-BDGDcIlunnaH3J9sEuDrwWsBR4Wjcy6Kxpxy9Dr6BlM="; + }; + + nativeBuildInputs = [ + poetry-core + toml-adapt + ]; + + propagatedBuildInputs = [ + niapy + numpy + pandas + scikit-learn + ]; + + # create scikit-learn dep version consistent + preBuild = '' + toml-adapt -path pyproject.toml -a change -dep scikit-learn -ver X + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "niaclass" + ]; + + meta = with lib; { + description = "A framework for solving classification tasks using Nature-inspired algorithms"; + homepage = "https://github.com/lukapecnik/NiaClass"; + license = licenses.mit; + maintainers = with maintainers; [ firefly-cpp ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7589f09fe926..1bb5e36b6376 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6513,6 +6513,8 @@ self: super: with self; { niaarm = callPackage ../development/python-modules/niaarm { }; + niaclass = callPackage ../development/python-modules/niaclass { }; + niapy = callPackage ../development/python-modules/niapy { }; nibabel = callPackage ../development/python-modules/nibabel { }; From 5b49c4e3a2e432a87c93e360d0a1e5a45fe90517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 9 Apr 2023 02:37:14 +0200 Subject: [PATCH 086/169] onefetch: 2.16.0 -> 2.17.0 Diff: https://github.com/o2sh/onefetch/compare/2.16.0...2.17.0 Changelog: https://github.com/o2sh/onefetch/blob/v2.17.0/CHANGELOG.md --- pkgs/tools/misc/onefetch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index e6f03942cfe0..1011ded3a1e3 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = version; - sha256 = "sha256-8YPexoTwtjYWSI2TP6mN3nkN8++3Upy+5AeQhb+HyyY="; + sha256 = "sha256-5d2u58i5VU+k1iC+bmiyKqe8qNTibryDxXNENxIflEI="; }; - cargoSha256 = "sha256-FF7JRZsrWyZKIFcOutjnCwgJzrmcOqcPA6bx1m5k7Pk="; + cargoSha256 = "sha256-PLxccKkJg9LNckAVG2iXU9XB1olAvVZQYRG8R6s+ibU="; cargoPatches = [ # enable pkg-config feature of zstd From a14f65e9c2fb5b1539ea3ee73e464dcca1aade1d Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Thu, 1 Sep 2022 13:10:27 +0800 Subject: [PATCH 087/169] gradience: init at 0.4.1 --- pkgs/applications/misc/gradience/default.nix | 80 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 82 insertions(+) create mode 100644 pkgs/applications/misc/gradience/default.nix diff --git a/pkgs/applications/misc/gradience/default.nix b/pkgs/applications/misc/gradience/default.nix new file mode 100644 index 000000000000..762408097108 --- /dev/null +++ b/pkgs/applications/misc/gradience/default.nix @@ -0,0 +1,80 @@ +{ stdenv +, lib +, fetchFromGitHub +, wrapGAppsHook4 +, meson +, ninja +, pkg-config +, glib +, desktop-file-utils +, gettext +, librsvg +, blueprint-compiler +, python3Packages +, sassc +, appstream-glib +, libadwaita +, libportal +, libportal-gtk4 +, libsoup_3 +, gobject-introspection +}: + +python3Packages.buildPythonApplication rec { + pname = "gradience"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "GradienceTeam"; + repo = "Gradience"; + # See https://github.com/GradienceTeam/Gradience/releases/tag/0.4.1-patch1 + rev = "0.4.1-patch1"; + sha256 = "sha256-5jloFbimJC4jP1C1uS8a9VlqyR5qqDuqcKvUXwr9SjY="; + }; + + format = "other"; + dontWrapGApps = true; + + nativeBuildInputs = [ + appstream-glib + blueprint-compiler + desktop-file-utils + gettext + glib + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook4 + sassc + ]; + + buildInputs = [ + libadwaita + libportal + libportal-gtk4 + librsvg + libsoup_3 + ]; + + propagatedBuildInputs = with python3Packages; [ + anyascii + jinja2 + lxml + material-color-utilities + pygobject3 + svglib + yapsy + ]; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + homepage = "https://github.com/GradienceTeam/Gradience"; + description = "Customize libadwaita and GTK3 apps (with adw-gtk3)"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b12bcb93d7d9..84c238af573f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8039,6 +8039,8 @@ with pkgs; grafterm = callPackage ../tools/misc/grafterm { }; + gradience = callPackage ../applications/misc/gradience { }; + grafx2 = callPackage ../applications/graphics/grafx2 { }; grails = callPackage ../development/web/grails { jdk = null; }; From dc73bd6430dc594655488337944b64a9841bf8d8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 8 Apr 2023 13:27:40 +1000 Subject: [PATCH 088/169] buildGo{Module,Package}: minor cleanup --- pkgs/build-support/go/module.nix | 6 ++---- pkgs/build-support/go/package.nix | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index aca313264a28..b75123bddf21 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -107,7 +107,7 @@ let buildPhase = args.modBuildPhase or '' runHook preBuild - '' + lib.optionalString (deleteVendor == true) '' + '' + lib.optionalString deleteVendor '' if [ ! -d vendor ]; then echo "vendor folder does not exist, 'deleteVendor' is not needed" exit 10 @@ -174,7 +174,7 @@ let GO111MODULE = "on"; GOFLAGS = lib.optionals (!proxyVendor) [ "-mod=vendor" ] ++ lib.optionals (!allowGoReference) [ "-trimpath" ]; - inherit CGO_ENABLED; + inherit CGO_ENABLED enableParallelBuilding; configurePhase = args.configurePhase or '' runHook preConfigure @@ -313,8 +313,6 @@ let passthru = passthru // { inherit go go-modules vendorSha256 vendorHash; }; - enableParallelBuilding = enableParallelBuilding; - meta = { # Add default meta information platforms = go.meta.platforms or lib.platforms.all; diff --git a/pkgs/build-support/go/package.nix b/pkgs/build-support/go/package.nix index 9106bf9796eb..378c2e60d06a 100644 --- a/pkgs/build-support/go/package.nix +++ b/pkgs/build-support/go/package.nix @@ -92,7 +92,7 @@ let GOHOSTARCH = go.GOHOSTARCH or null; GOHOSTOS = go.GOHOSTOS or null; - inherit CGO_ENABLED; + inherit CGO_ENABLED enableParallelBuilding; GO111MODULE = "off"; GOFLAGS = lib.optionals (!allowGoReference) [ "-trimpath" ]; @@ -107,7 +107,7 @@ let mkdir -p "go/src/$(dirname "$goPackagePath")" mv "$sourceRoot" "go/src/$goPackagePath" - '' + lib.optionalString (deleteVendor == true) '' + '' + lib.optionalString deleteVendor '' if [ ! -d "go/src/$goPackagePath/vendor" ]; then echo "vendor folder does not exist, 'deleteVendor' is not needed" exit 10 @@ -279,8 +279,6 @@ let { inherit go; } // lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; }; - enableParallelBuilding = enableParallelBuilding; - meta = { # Add default meta information homepage = "https://${goPackagePath}"; From d1d1b9d6b7e3e21cd7386f1ee382b2bc530d6566 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 6 Apr 2023 23:04:47 -0300 Subject: [PATCH 089/169] apl386: init at unstable-2022-03-07 --- pkgs/data/fonts/apl386/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/data/fonts/apl386/default.nix diff --git a/pkgs/data/fonts/apl386/default.nix b/pkgs/data/fonts/apl386/default.nix new file mode 100644 index 000000000000..15c61d41aa69 --- /dev/null +++ b/pkgs/data/fonts/apl386/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation { + pname = "apl386"; + version = "unstable-2022-03-07"; + + src = fetchFromGitHub { + owner = "abrudz"; + repo = "APL386"; + rev = "6332c9dbb588946a0e8c9d7984dd0c003eeea266"; + hash = "sha256-oHk4e7NRgAjGtZzQmZToYz7wCZETaj7/yRwZMeeYF2M="; + }; + + installPhase = '' + runHook preInstall + + install -Dm444 -t $out/share/fonts/truetype *.ttf + + runHook postInstall + ''; + + meta = { + homepage = "https://abrudz.github.io/APL386/"; + description = "APL385 Unicode font evolved"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7dc4ba4785d..3d0388bfd7c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27582,6 +27582,8 @@ with pkgs; brise = callPackage ../data/misc/brise { }; + apl386 = callPackage ../data/fonts/apl386 { }; + bqn386 = callPackage ../data/fonts/bqn386 { }; cacert = callPackage ../data/misc/cacert { }; From 8650711fd81c6131ca77ec43f35e8b88d03b216a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 6 Apr 2023 23:05:27 -0300 Subject: [PATCH 090/169] bqn386: split woff2 fonts into a separate output --- pkgs/data/fonts/bqn386/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/data/fonts/bqn386/default.nix b/pkgs/data/fonts/bqn386/default.nix index b908e2e2381e..de1be0cc6f55 100644 --- a/pkgs/data/fonts/bqn386/default.nix +++ b/pkgs/data/fonts/bqn386/default.nix @@ -11,20 +11,22 @@ stdenvNoCC.mkDerivation { hash = "sha256-f0MbrxdkEiOqod41U07BvdDFDbFCqJuGyDIcx2Y24D0="; }; + outputs = [ "out" "woff2" ]; + installPhase = '' runHook preInstall - install -Dm644 -t $out/share/fonts/truetype *.ttf - install -Dm644 -t $out/share/fonts/woff2 *.woff2 + install -Dm444 -t $out/share/fonts/truetype *.ttf + install -Dm444 -t $woff2/share/fonts/woff2 *.woff2 runHook postInstall ''; - meta = with lib; { + meta = { description = "An APL and BQN font extending on APL386"; homepage = "https://dzaima.github.io/BQN386/"; - license = licenses.unlicense; - maintainers = with maintainers; [ skykanin ]; - platforms = platforms.all; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ skykanin ]; + platforms = lib.platforms.all; }; } From f4f836e4dee5e25cd7698045e4b37f3e747d9d4a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 7 Apr 2023 00:30:09 -0300 Subject: [PATCH 091/169] dt-shell-color-scripts: remove --- .../misc/dt-shell-color-scripts/default.nix | 45 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 46 deletions(-) delete mode 100644 pkgs/tools/misc/dt-shell-color-scripts/default.nix diff --git a/pkgs/tools/misc/dt-shell-color-scripts/default.nix b/pkgs/tools/misc/dt-shell-color-scripts/default.nix deleted file mode 100644 index 4dedbd66b332..000000000000 --- a/pkgs/tools/misc/dt-shell-color-scripts/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, installShellFiles -, runtimeShell -, makeWrapper -}: - -stdenv.mkDerivation { - pname = "dt-shell-color-scripts"; - version = "unstable-2022-07-25"; - - src = fetchFromGitLab { - owner = "dwt1"; - repo = "shell-color-scripts"; - rev = "da2e3c512b94f312ee54a38d5cde131b0511ad01"; - sha256 = "sha256-cdTgBbtsbJHaJuLIcZh0g0jKOrQyFx3P6QhYNx8hz0U="; - }; - - nativeBuildInputs = [ makeWrapper installShellFiles ]; - - installPhase = '' - runHook preInstall - patchShebangs ./colorscript.sh - patchShebangs ./colorscripts - mkdir -p $out/bin - mkdir -p $out/opt/shell-color-scripts/ - cp -r colorscripts $out/opt/shell-color-scripts/colorscripts - installManPage colorscript.1 - installShellCompletion --fish completions/colorscript.fish - installShellCompletion --zsh completions/_colorscript - chmod +x colorscript.sh - cp colorscript.sh $out/bin/colorscript - substituteInPlace $out/bin/colorscript \ - --replace "/opt/shell-color-scripts/colorscripts" "$out/opt/shell-color-scripts/colorscripts" - runHook postInstall - ''; - - meta = with lib; { - description = "A collection of shell color scripts collected by dt (Derek Taylor)"; - homepage = "https://gitlab.com/dwt1/shell-color-scripts"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ drzoidberg ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d0388bfd7c6..eab38d1faf11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4564,7 +4564,6 @@ with pkgs; dtools = callPackage ../development/tools/dtools { }; - dt-shell-color-scripts = callPackage ../tools/misc/dt-shell-color-scripts { }; dtrx = callPackage ../tools/compression/dtrx { }; From 22940300fec1b4be169404422a60d3777a0c1491 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 7 Apr 2023 00:32:16 -0300 Subject: [PATCH 092/169] dwt1-shell-color-scripts: init at unstable-2023-03-27 --- .../misc/dwt1-shell-color-scripts/default.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/tools/misc/dwt1-shell-color-scripts/default.nix diff --git a/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix b/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix new file mode 100644 index 000000000000..39a9187b3bab --- /dev/null +++ b/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenvNoCC +, fetchFromGitLab +, installShellFiles +}: + +stdenvNoCC.mkDerivation { + pname = "dwt1-shell-color-scripts"; + version = "unstable-2023-03-27"; + + src = fetchFromGitLab { + owner = "dwt1"; + repo = "shell-color-scripts"; + rev = "576735cf656ece1bfd314e617b91c0e9d486d262"; + hash = "sha256-1iDcUv6uVq5LzFgZo36RRKqAzKoYKZW/MnlbneayvCY="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + postPatch = '' + patchShebangs ./colorscript.sh + patchShebangs ./colorscripts + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/shell-color-scripts + install -Dm755 colorscript.sh $out/bin/colorscript + cp -r colorscripts $out/share/shell-color-scripts/colorscripts + + installManPage colorscript.1 + installShellCompletion --fish completions/colorscript.fish + installShellCompletion --zsh completions/_colorscript + + runHook postInstall + ''; + + postFixup = '' + substituteInPlace $out/bin/colorscript \ + --replace "/opt/shell-color-scripts/colorscripts" \ + "$out/share/shell-color-scripts/colorscripts" + ''; + + meta = { + homepage = "https://gitlab.com/dwt1/shell-color-scripts"; + description = "A collection of shell color scripts collected by dt (Derek Taylor)"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eab38d1faf11..5a57c735003f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4564,6 +4564,7 @@ with pkgs; dtools = callPackage ../development/tools/dtools { }; + dwt1-shell-color-scripts = callPackage ../tools/misc/dwt1-shell-color-scripts { }; dtrx = callPackage ../tools/compression/dtrx { }; From 9dc1574013cf5d8529e7909d3c78fb412197e3ad Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 7 Apr 2023 00:56:08 -0300 Subject: [PATCH 093/169] nux: refactor --- pkgs/tools/misc/nux/default.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/nux/default.nix b/pkgs/tools/misc/nux/default.nix index d3f26d850e5f..a852f830937b 100644 --- a/pkgs/tools/misc/nux/default.nix +++ b/pkgs/tools/misc/nux/default.nix @@ -5,31 +5,34 @@ , installShellFiles }: -rustPlatform.buildRustPackage rec { +let pname = "nux"; version = "0.1.4"; +in +rustPlatform.buildRustPackage { + inherit pname version; src = fetchFromGitHub { owner = "NuxPackage"; repo = pname; rev = version; - sha256 = "sha256-k3HRaWN8/MTZRGWBxI8RRK0tcSYBbSLs3vHkUdLGTc8"; + hash = "sha256-k3HRaWN8/MTZRGWBxI8RRK0tcSYBbSLs3vHkUdLGTc8"; }; - cargoSha256 = "sha256-wfUr3dcdALMEgJ6CaXhK4Gqk6xflCnov9tELA63drV4="; + cargoHash = "sha256-wfUr3dcdALMEgJ6CaXhK4Gqk6xflCnov9tELA63drV4="; - preFixup = '' + nativeBuildInputs = [ asciidoctor installShellFiles ]; + + postInstall = '' installManPage $releaseDir/build/nux-*/out/nux.1 installShellCompletion $releaseDir/build/nux-*/out/nux.{bash,fish} installShellCompletion $releaseDir/build/nux-*/out/_nux - ''; - nativeBuildInputs = [ asciidoctor installShellFiles ]; - meta = with lib; { - description = "A wrapper over the nix cli"; + meta = { homepage = "https://github.com/NuxPackage/nux"; - license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ drzoidberg ]; + description = "A wrapper over the nix cli"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ ]; }; } From d7c5b735a09fabc7a93a669ed19d26760b3f977a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 7 Apr 2023 00:59:01 -0300 Subject: [PATCH 094/169] maintainers: remove drzoidberg The maintainers is silent since 2022. --- maintainers/maintainer-list.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e29c2cc8e16c..b4cd3901e135 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4095,12 +4095,6 @@ fingerprint = "85F3 72DF 4AF3 EF13 ED34 72A3 0AAF 2901 E804 0715"; }]; }; - drzoidberg = { - email = "jakob@mast3rsoft.com"; - github = "jakobneufeld"; - githubId = 24791219; - name = "Jakob Neufeld"; - }; dsalaza4 = { email = "podany270895@gmail.com"; github = "dsalaza4"; From 2918f41670c3e2a19fbd8b61e359ffb0b644e33e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 9 Apr 2023 04:20:00 +0000 Subject: [PATCH 095/169] luau: 0.570 -> 0.571 https://github.com/Roblox/luau/releases/tag/0.571 --- pkgs/development/interpreters/luau/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index 5354779efc8a..8c55b8870a9c 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.570"; + version = "0.571"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-22T/NweWrDNWmGKJIk/htHUSU2htwsJ+0tHw5AtfoOo="; + hash = "sha256-LWA4cssbdV2LfNRYygDHehmnTfNLvbZrh34NjGf3fqg="; }; nativeBuildInputs = [ cmake ]; From 7f4db028810bf0acb1d30ae7b2bc33afda9faecd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 9 Apr 2023 04:20:00 +0000 Subject: [PATCH 096/169] tflint: 0.45.0 -> 0.46.0 https://github.com/terraform-linters/tflint/releases/tag/v0.46.0 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index df6a7976de3e..7c09718fd951 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.45.0"; + version = "0.46.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tsnW6KoLHEWd/uDZrK2cnVZ2IWftoxZ5zGdYhRdUp9Q="; + hash = "sha256-ne/i8LLNCo5Kg0xAL/ZexR5uRmZLXcgZ6yZNT5vSYb0="; }; - vendorSha256 = "sha256-crGs7j9hAnGCCFjhigIJVpTM0rr9WgvBq3/ZGt6hwqQ="; + vendorHash = "sha256-K+/xJ9ei+LyWodubRw5mFzi4U1V1MB5h4nUuPrTASBY="; doCheck = false; From bd8faee2d532664fddee80c2c68298d0fdb55665 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 9 Apr 2023 04:20:00 +0000 Subject: [PATCH 097/169] cloud-nuke: 0.29.0 -> 0.29.2 https://github.com/gruntwork-io/cloud-nuke/releases/tag/v0.29.1 https://github.com/gruntwork-io/cloud-nuke/releases/tag/v0.29.2 --- pkgs/development/tools/cloud-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 67abc09d6a30..6358d0bf6050 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.29.0"; + version = "0.29.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - hash = "sha256-v+YUd9dPp3KO1lsGDrDEEdrXNM53M0TOCF643pjq3tA="; + hash = "sha256-hf86r5Q9fvk+vJsOjm6tqj6hT1eZpf8gtOmHA6wKwr0="; }; - vendorHash = "sha256-shn/0xUQO9cm54wYJBWNOsP1NalYKOTJ5Kf4i6KCfx4="; + vendorHash = "sha256-6+uQAEp+fRlRrwfJR0eDMXs0mEQwzWadLxCrXrDREhs="; ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; From 88aded71bb383c2fadcb621d5574ce629fccacb7 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 9 Apr 2023 13:07:30 +0800 Subject: [PATCH 098/169] ncspot: add extra features --- pkgs/applications/audio/ncspot/default.nix | 31 +++++++++++++++++----- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 23637fc8b410..8609912456b5 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -1,8 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, ncurses +, openssl +, Cocoa , withALSA ? true, alsa-lib +, withClipboard ? true, libxcb, python3 +, withCover ? false, ueberzug , withPulseAudio ? false, libpulseaudio , withPortAudio ? false, portaudio -, withMPRIS ? false, dbus +, withMPRIS ? true, withNotify ? true, dbus }: rustPlatform.buildRustPackage rec { @@ -18,23 +27,31 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-tEk7BxAN8jEquJiv89vC0lYrB/sKeZhThBzs09A9NpA="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config ] + ++ lib.optional withClipboard python3; buildInputs = [ ncurses ] ++ lib.optional stdenv.isLinux openssl ++ lib.optional withALSA alsa-lib + ++ lib.optional withClipboard libxcb + ++ lib.optional withCover ueberzug ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio - ++ lib.optional withMPRIS dbus; + ++ lib.optional (withMPRIS || withNotify) dbus + ++ lib.optional stdenv.isDarwin Cocoa; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DNCURSES_UNCTRL_H_incl"; buildNoDefaultFeatures = true; + buildFeatures = [ "cursive/pancurses-backend" ] ++ lib.optional withALSA "alsa_backend" + ++ lib.optional withClipboard "share_clipboard" + ++ lib.optional withCover "cover" ++ lib.optional withPulseAudio "pulseaudio_backend" ++ lib.optional withPortAudio "portaudio_backend" - ++ lib.optional withMPRIS "mpris"; - - doCheck = false; + ++ lib.optional withMPRIS "mpris" + ++ lib.optional withNotify "notify"; meta = with lib; { description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7dc4ba4785d..d0581e06d475 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32579,6 +32579,8 @@ with pkgs; ncdc = callPackage ../applications/networking/p2p/ncdc { }; ncspot = callPackage ../applications/audio/ncspot { + inherit (darwin.apple_sdk.frameworks) Cocoa; + withALSA = stdenv.isLinux; withPulseAudio = config.pulseaudio or stdenv.isLinux; withPortAudio = stdenv.isDarwin; From 0cb08723b60dcd5f67f1af047f684db280dfa74d Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Sun, 9 Apr 2023 09:29:13 +0300 Subject: [PATCH 099/169] maintainers: add tie --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/servers/pufferpanel/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b4cd3901e135..70712891899d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15271,6 +15271,12 @@ githubId = 1618946; name = "Tiago Castro"; }; + tie = { + name = "Ivan Trubach"; + email = "mr.trubach@icloud.com"; + github = "tie"; + githubId = 14792994; + }; tilcreator = { name = "TilCreator"; email = "contact.nixos@tc-j.de"; diff --git a/pkgs/servers/pufferpanel/default.nix b/pkgs/servers/pufferpanel/default.nix index bfb9106b90ea..be2aaffd1e90 100644 --- a/pkgs/servers/pufferpanel/default.nix +++ b/pkgs/servers/pufferpanel/default.nix @@ -94,6 +94,6 @@ buildGoModule rec { description = "A free, open source game management panel"; homepage = "https://www.pufferpanel.com/"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ckie tie ]; }; } From 569784d50be3560d211e3af2720b81ac2cc66df0 Mon Sep 17 00:00:00 2001 From: Arnav Vijaywargiya Date: Fri, 7 Apr 2023 11:48:34 +0530 Subject: [PATCH 100/169] minetest: 5.6.1 -> 5.7.0 --- pkgs/games/minetest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index a23868a50202..0f645ce37967 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -128,9 +128,9 @@ let }; v5 = { - version = "5.6.1"; - sha256 = "sha256-1mUmtM09jqJhD2RcLCAjaI+JkqP52QYH3KLkY5MZ860="; - dataSha256 = "sha256-Ye8MihrOqjSoy+vNr/CM/C/sNXdexe08dxrmoMxsG/A="; + version = "5.7.0"; + sha256 = "sha256-9AL6gTmy05yTeYfCq3EMK4gqpBWdHwvJ5Flpzj8hFAE="; + dataSha256 = "sha256-wWgeO8513N5jQdWvZrq357fPpAU5ik06mgZraWCQawo="; }; mkClient = version: generic (version // { buildClient = true; buildServer = false; }); From 7c03fd0458a13b7499a12b244e2e218f3fc80576 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 09:38:35 +0200 Subject: [PATCH 101/169] python310Packages.et_xmlfile: normalize pname --- .../python-modules/et_xmlfile/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/et_xmlfile/default.nix b/pkgs/development/python-modules/et_xmlfile/default.nix index 538ed10cde36..9e3416540f75 100644 --- a/pkgs/development/python-modules/et_xmlfile/default.nix +++ b/pkgs/development/python-modules/et_xmlfile/default.nix @@ -6,15 +6,20 @@ }: buildPythonPackage rec { + pname = "et-xmlfile"; version = "1.0.1"; - pname = "et_xmlfile"; src = fetchPypi { - inherit pname version; + pname = "et_xmlfile"; + inherit version; sha256="0nrkhcb6jdrlb6pwkvd4rycw34y3s931hjf409ij9xkjsli9fkb1"; }; - nativeCheckInputs = [ lxml pytest ]; + nativeCheckInputs = [ + lxml + pytest + ]; + checkPhase = '' py.test $out ''; @@ -36,5 +41,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ ]; }; - } From 99a7b13af8e2585a441316ac746824087a2a0a02 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 09:40:04 +0200 Subject: [PATCH 102/169] python310Packages.et_xmlfile: add pythonImportsCheck --- pkgs/development/python-modules/et_xmlfile/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/et_xmlfile/default.nix b/pkgs/development/python-modules/et_xmlfile/default.nix index 9e3416540f75..5d4b5e2ec61d 100644 --- a/pkgs/development/python-modules/et_xmlfile/default.nix +++ b/pkgs/development/python-modules/et_xmlfile/default.nix @@ -24,6 +24,10 @@ buildPythonPackage rec { py.test $out ''; + pythonImportsCheck = [ + "et_xmlfile" + ]; + meta = with lib; { description = "An implementation of lxml.xmlfile for the standard library"; longDescription = '' From 59a173d1c27dd4c777d7a26446459336e9bf9df5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 09:43:19 +0200 Subject: [PATCH 103/169] python310Packages.et_xmlfile: update homepage --- pkgs/development/python-modules/et_xmlfile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/et_xmlfile/default.nix b/pkgs/development/python-modules/et_xmlfile/default.nix index 5d4b5e2ec61d..0d04e264c389 100644 --- a/pkgs/development/python-modules/et_xmlfile/default.nix +++ b/pkgs/development/python-modules/et_xmlfile/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { The code was written by Elias Rabel as part of the Python Düsseldorf openpyxl sprint in September 2014. ''; - homepage = "https://pypi.python.org/pypi/et_xmlfile"; + homepage = "https://foss.heptapod.net/openpyxl/et_xmlfile"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From 179eda92f8145af9d56d738ce9628622bf6e9c65 Mon Sep 17 00:00:00 2001 From: Ruixi-rebirth Date: Sun, 9 Apr 2023 15:43:32 +0800 Subject: [PATCH 104/169] go-musicfox: 3.7.7 -> 4.0.0 --- pkgs/applications/audio/go-musicfox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index 40ecd0dd21a6..1faba8f80e51 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -10,13 +10,13 @@ # gcc only supports objc on darwin buildGoModule.override { stdenv = clangStdenv; } rec { pname = "go-musicfox"; - version = "3.7.7"; + version = "4.0.0"; src = fetchFromGitHub { owner = "anhoder"; repo = pname; rev = "v${version}"; - hash = "sha256-gQPr+mCZ7tnASs/ibow1b0Qj3ppZhdgP4U1Vxo+FfE4="; + hash = "sha256-nhUsudytVSY/wbaP8ZuXurU2rxQPPblgPGdEyGjVpG4="; }; deleteVendor = true; From b5f5ba93d6b299114d6a55a045737aaeb7e2c89f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 09:45:24 +0200 Subject: [PATCH 105/169] python310Packages.et_xmlfile: disable on unsupported releases - add format --- pkgs/development/python-modules/et_xmlfile/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/et_xmlfile/default.nix b/pkgs/development/python-modules/et_xmlfile/default.nix index 0d04e264c389..88028bae07e3 100644 --- a/pkgs/development/python-modules/et_xmlfile/default.nix +++ b/pkgs/development/python-modules/et_xmlfile/default.nix @@ -3,11 +3,15 @@ , fetchPypi , lxml , pytest +, pythonOlder }: buildPythonPackage rec { pname = "et-xmlfile"; version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "et_xmlfile"; From 429aff605527ad9a78140f97ee11e9cd306d6bb4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 09:47:31 +0200 Subject: [PATCH 106/169] python310Packages.et_xmlfile: move to pytestCheckHook --- pkgs/development/python-modules/et_xmlfile/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/et_xmlfile/default.nix b/pkgs/development/python-modules/et_xmlfile/default.nix index 88028bae07e3..f09d0042003a 100644 --- a/pkgs/development/python-modules/et_xmlfile/default.nix +++ b/pkgs/development/python-modules/et_xmlfile/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , lxml -, pytest +, pytestCheckHook , pythonOlder }: @@ -21,13 +21,9 @@ buildPythonPackage rec { nativeCheckInputs = [ lxml - pytest + pytestCheckHook ]; - checkPhase = '' - py.test $out - ''; - pythonImportsCheck = [ "et_xmlfile" ]; From f6ad3df1ecfc972c5a9b13e20369e6d66cd08fd3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 10:00:56 +0200 Subject: [PATCH 107/169] python310Packages.et_xmlfile: 1.0.1 -> 1.1 Diff: https://foss.heptapod.net/openpyxl/et_xmlfile/-/compare/1.0.1...1.1 --- .../python-modules/et_xmlfile/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/et_xmlfile/default.nix b/pkgs/development/python-modules/et_xmlfile/default.nix index f09d0042003a..b744d2a693dd 100644 --- a/pkgs/development/python-modules/et_xmlfile/default.nix +++ b/pkgs/development/python-modules/et_xmlfile/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitLab , lxml , pytestCheckHook , pythonOlder @@ -8,15 +8,17 @@ buildPythonPackage rec { pname = "et-xmlfile"; - version = "1.0.1"; + version = "1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "et_xmlfile"; - inherit version; - sha256="0nrkhcb6jdrlb6pwkvd4rycw34y3s931hjf409ij9xkjsli9fkb1"; + src = fetchFromGitLab { + domain = "foss.heptapod.net"; + owner = "openpyxl"; + repo = "et_xmlfile"; + rev = version; + hash = "sha256-MJimcnYKujOL3FedGreNpuw1Jpg48ataDmFd1qwTS5A="; }; nativeCheckInputs = [ @@ -37,9 +39,6 @@ buildPythonPackage rec { allowing code to be developed that will work with both libraries. It was developed initially for the openpyxl project but is now a standalone module. - - The code was written by Elias Rabel as part of the Python - Düsseldorf openpyxl sprint in September 2014. ''; homepage = "https://foss.heptapod.net/openpyxl/et_xmlfile"; license = licenses.mit; From 1516704b0ddd783b48505f97c6206255d59691a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 10:08:01 +0200 Subject: [PATCH 108/169] python310Packages.aiopyarr: 22.11.0 -> 23.4.0 Diff: https://github.com/tkdrob/aiopyarr/compare/22.11.0...23.4.0 --- pkgs/development/python-modules/aiopyarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiopyarr/default.nix b/pkgs/development/python-modules/aiopyarr/default.nix index 65ce5e4adbbf..822fe258d593 100644 --- a/pkgs/development/python-modules/aiopyarr/default.nix +++ b/pkgs/development/python-modules/aiopyarr/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiopyarr"; - version = "22.11.0"; + version = "23.4.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - hash = "sha256-8/ixL4ByaBYoPbB4g+Rgx+5OM6vjrFTUEPR42wBKyyg="; + hash = "sha256-CzNB6ymvDTktiOGdcdCvWLVQ3mKmbdMpc/vezSXCpG4="; }; postPatch = '' From fd284a179f4d7e44ac506b556c6b0d77d9b0c5f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 10:10:36 +0200 Subject: [PATCH 109/169] python310Packages.mkdocstrings: 0.20.0 -> 0.21.2 Diff: https://github.com/mkdocstrings/mkdocstrings/compare/refs/tags/0.20.0...0.21.2 Changelog: https://github.com/mkdocstrings/mkdocstrings/blob/0.21.2/CHANGELOG.md --- pkgs/development/python-modules/mkdocstrings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index 4d367c809d44..fbbdb91feb2d 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.20.0"; + version = "0.21.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-eFHcwbYEIwVWvDJWlmeUvEdqp3NYAF8SgdHJGw6bEMc="; + hash = "sha256-pi0BEe/zhG/V9wh2CO91Cc7Mze93+2tbVo6/2LGQ6Nw="; }; postPatch = '' From a2d13a6801ecf2c0ee783717f247f7e8a0ec7a55 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 9 Apr 2023 02:11:55 -0600 Subject: [PATCH 110/169] fwupd: 1.8.13 -> 1.8.14 https://github.com/fwupd/fwupd/compare/1.8.13...1.8.14 Contains a fix for https://github.com/fwupd/fwupd/issues/5656. --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 307b34a8b4ec..2264e212ec67 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -122,7 +122,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "1.8.13"; + version = "1.8.14"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; rev = finalAttrs.version; - hash = "sha256-UBKFC/hq4kkrjkuHTqIimbR332Vk/X4VQeYROGeAVi8="; + hash = "sha256-xq9J44yhnF3bTutlkOLIMFM96XHMmoCL8i37tSxgPp0="; }; patches = [ From d816db9b96618a36522de395de072fb53240b8fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 10:12:34 +0200 Subject: [PATCH 111/169] python310Packages.aiopyarr: add changelog to meta --- pkgs/development/python-modules/aiopyarr/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiopyarr/default.nix b/pkgs/development/python-modules/aiopyarr/default.nix index 822fe258d593..c4a6cf05ad51 100644 --- a/pkgs/development/python-modules/aiopyarr/default.nix +++ b/pkgs/development/python-modules/aiopyarr/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tkdrob"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-CzNB6ymvDTktiOGdcdCvWLVQ3mKmbdMpc/vezSXCpG4="; }; @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API client for Lidarr/Radarr/Readarr/Sonarr"; homepage = "https://github.com/tkdrob/aiopyarr"; + changelog = "https://github.com/tkdrob/aiopyarr/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From fa6b4799a6a487faf0f588608855c54e534df0fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 10:13:37 +0200 Subject: [PATCH 112/169] python310Packages.pontos: 23.4.0 -> 23.4.1 Diff: https://github.com/greenbone/pontos/compare/refs/tags/v23.4.0...v23.4.1 Changelog: https://github.com/greenbone/pontos/releases/tag/v23.4.1 --- pkgs/development/python-modules/pontos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 674699bb0e91..9a65b03701dc 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.4.0"; + version = "23.4.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nMuf8k7o7cCpvk9IUp7lz6jM7rqCxHq4uT51R1w8jtM="; + hash = "sha256-siaOZClcqivFZlscPiEo3skL6oVjDEWrabP8I+IvQJ8="; }; nativeBuildInputs = [ From 8b1e0ff0e7a82968f00ed6665c4956c2a2286f16 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 10:14:29 +0200 Subject: [PATCH 113/169] python310Packages.zwave-me-ws: 0.3.6 -> 0.4.2 Diff: https://github.com/Z-Wave-Me/zwave-me-ws/compare/refs/tags/v0.3.6...v0.4.2 Changelog: https://github.com/Z-Wave-Me/zwave-me-ws/releases/tag/v0.4.2 --- pkgs/development/python-modules/zwave-me-ws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-me-ws/default.nix b/pkgs/development/python-modules/zwave-me-ws/default.nix index 20f4379ddd6d..65e1b706642f 100644 --- a/pkgs/development/python-modules/zwave-me-ws/default.nix +++ b/pkgs/development/python-modules/zwave-me-ws/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zwave-me-ws"; - version = "0.3.6"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Z-Wave-Me"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-d/Y2rZArBywTQE1vsE/B5bEPb48kcEqhDP/xfxJBzJs="; + hash = "sha256-Wo67G5jzNDl+70+pXEwCw4vck3Dlh7ClpPO6T7RYdBc="; }; nativeBuildInputs = [ From 08078f6ab7b2136ad81bf2df54b3b9139f5cad0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Mar 2023 01:54:44 +0000 Subject: [PATCH 114/169] irrlichtmt: 1.9.0mt8 -> 1.9.0mt10 --- pkgs/development/libraries/irrlichtmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/irrlichtmt/default.nix b/pkgs/development/libraries/irrlichtmt/default.nix index c5d2bcf17691..8a080c1d4a97 100644 --- a/pkgs/development/libraries/irrlichtmt/default.nix +++ b/pkgs/development/libraries/irrlichtmt/default.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "irrlichtmt"; - version = "1.9.0mt8"; + version = "1.9.0mt10"; src = fetchFromGitHub { owner = "minetest"; repo = "irrlicht"; rev = version; - sha256 = "sha256-bwpALhBk16KugYqKuN57M3t5Ba7rdyrYWn/iBoi8hpg="; + sha256 = "sha256-PA+gz77XkwxQ3TtubaT0ov9dsT7s3ZlrQxrOkD5ku3g="; }; nativeBuildInputs = [ From bfb7a581c85a74bffca2f459e698a07fa8a3c987 Mon Sep 17 00:00:00 2001 From: iopq Date: Sun, 9 Apr 2023 16:19:45 +0800 Subject: [PATCH 115/169] xray: fix GUI compatibility While the package itself will look for assets in both folders, ./xray and ./v2ray the GUIs don't always support this, so since we use the v2ray-assets we should also set the V2RAY_LOCATION_ASSET variable to hint them to look at the ./v2ray folder --- pkgs/tools/networking/xray/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix index 621de22e4c00..7b6282907dcc 100644 --- a/pkgs/tools/networking/xray/default.nix +++ b/pkgs/tools/networking/xray/default.nix @@ -51,7 +51,7 @@ buildGoModule rec { postFixup = '' wrapProgram $out/bin/xray \ - --suffix XRAY_LOCATION_ASSET : $assetsDrv/share/v2ray + --suffix V2RAY_LOCATION_ASSET : $assetsDrv/share/v2ray ''; passthru = { From a3f6d55533380b3e94805499bcb1a9f516880a34 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 7 Apr 2023 10:42:00 +0300 Subject: [PATCH 116/169] pistol: 0.3.2 -> 0.3.3 Diff: https://github.com/doronbehar/pistol/compare/v0.3.2...v0.3.3 Switch to postInstall from postBuild - See: https://discourse.nixos.org/t/cant-update-a-go-package-getting-go-inconsistent-vendoring/27063/6 --- pkgs/tools/misc/pistol/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index 930554d18696..97acb528abae 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pistol"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DGbWlEDI/qGNpdT8N79RsLxnUm4Sw8lHFRIBFd1GmK0="; + sha256 = "sha256-6V3Du3+0YliwzsvZolapBAnyqbsv1WZhWQkaldDR+Ok="; }; - vendorSha256 = "sha256-poTd0lXRaJeDxwcw+h76NPC0mFB9nwm2vLLB5UUK1dk="; + vendorSha256 = "sha256-jURN0NSc9SFHFMS8QdaEqqBwOHnAEEJQlQXHTUDRiyE="; doCheck = false; @@ -30,7 +30,7 @@ buildGoModule rec { installShellFiles asciidoctor ]; - postBuild = '' + postInstall = '' asciidoctor -b manpage -d manpage README.adoc installManPage pistol.1 ''; From f597cba178c8c63341360f973e5b8c8ed425c334 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 10:37:28 +0200 Subject: [PATCH 117/169] kubescape: 2.2.5 -> 2.2.6 Diff: https://github.com/kubescape/kubescape.git/compare/refs/tags/v2.2.5...v2.2.6 Changelog: https://github.com/kubescape/kubescape/releases/tag/v2.2.6 --- pkgs/tools/security/kubescape/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index b8994acdf173..63d829caccd7 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "kubescape"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "kubescape"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-J3E41xQxI53iRfo5E+DMXD70sSCBO3TpSm3qZmpxvW8="; + hash = "sha256-tXfjbE4C08YWgLJlZHjagAP3upqCpaOgwSegovVSFCI="; fetchSubmodules = true; }; - vendorHash = "sha256-KoAuM1H9FRcPLD0AipnXOCUiNHcCWnek4sV0ztu5SyI="; + vendorHash = "sha256-bZPM8PCn0+W7Sf/+lQ3ASeqxFSZi49r32rjvQdD7Bvc="; nativeBuildInputs = [ installShellFiles From 1a827d74d82ae0954f4f5ab9f6f366f7cd977283 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 10:38:08 +0200 Subject: [PATCH 118/169] exploitdb: 2023-04-08 -> 2023-04-09 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-04-08...2023-04-09 --- 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 be749febae75..2b1075da70c0 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-04-08"; + version = "2023-04-09"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-dleCqYSfmp0XU1UbX/HSq7EbwTcUcr6PbsTEri72Hoo="; + hash = "sha256-4eUDdtKUAHN18IoaODHGaxgcB44o3VoUvIYYka+V1qo="; }; nativeBuildInputs = [ From 89a0fabf6a06a390a6a9d8791d16abfdac09e254 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sun, 9 Apr 2023 10:39:24 +0200 Subject: [PATCH 119/169] ugrep: 3.11.0 -> 3.11.2 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 4832fa3b6e73..22311f9d0c04 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.11.0"; + version = "3.11.2"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - hash = "sha256-nqnuEahOsnGX38526cIe8Vj7YoEJxO1ydbgfPwlpK+o="; + hash = "sha256-NDH2OEweIU0/JHfkq0md6cll2uwCTLkVmJcmF337DUw="; }; buildInputs = [ From 7f8f94d0a7b75257828bef4a385b4e5e078ef767 Mon Sep 17 00:00:00 2001 From: Thomas BESSOU Date: Sun, 9 Apr 2023 10:57:43 +0200 Subject: [PATCH 120/169] smartgithg: 22.1.4 -> 22.1.5 --- pkgs/applications/version-management/smartgithg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 32dc11d4527d..ecef523a0ec8 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "smartgithg"; - version = "22.1.4"; + version = "22.1.5"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "sha256-e5bgIA7dblRDWvwC2dqRFR+Sp6uMAWQbhlMqG8a4vZk="; + sha256 = "sha256-s31sYEC1g7eLMhT9UkmjbBnHePY9wnQPmgGQXgVX4j4="; }; nativeBuildInputs = [ wrapGAppsHook ]; From 5b84ccce78843b2b13721c67aa9a3fa10eb14ac5 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 9 Apr 2023 11:06:45 +0200 Subject: [PATCH 121/169] exercism: add update script --- pkgs/applications/misc/exercism/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index f13d45059473..c440c0cc8206 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -1,22 +1,24 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nix-update-script }: buildGoModule rec { pname = "exercism"; version = "3.1.0"; src = fetchFromGitHub { - owner = "exercism"; - repo = "cli"; - rev = "v${version}"; - sha256 = "sha256-9GdkQaxYvxMGI5aFwUtQnctjpZfjZaKP3CsMjC/ZBSo"; + owner = "exercism"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-9GdkQaxYvxMGI5aFwUtQnctjpZfjZaKP3CsMjC/ZBSo="; }; - vendorSha256 = "sha256-EW9SNUqJHgPQlNpeErYaooJRXGcDrNpXLhMYpmZPVSw"; + vendorHash = "sha256-EW9SNUqJHgPQlNpeErYaooJRXGcDrNpXLhMYpmZPVSw="; doCheck = false; subPackages = [ "./exercism" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { inherit (src.meta) homepage; description = "A Go based command line tool for exercism.io"; From bd81c94de08beb58aa6a2f090f7e751961e9dbc6 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 9 Apr 2023 11:32:52 +0200 Subject: [PATCH 122/169] rustic-rs: add update script --- pkgs/tools/backup/rustic-rs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/rustic-rs/default.nix b/pkgs/tools/backup/rustic-rs/default.nix index 5487a2641750..91d25cbb9859 100644 --- a/pkgs/tools/backup/rustic-rs/default.nix +++ b/pkgs/tools/backup/rustic-rs/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, stdenv, Security, installShellFiles }: +{ lib, fetchFromGitHub, rustPlatform, stdenv, Security, installShellFiles, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "rustic-rs"; @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "rustic-rs"; repo = "rustic"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-r4hOjX/LKv2wX720FMEztUo9rf2hDBLfcHtENSZNA3U="; }; @@ -28,6 +28,8 @@ rustPlatform.buildRustPackage rec { installShellCompletion rustic.{ba,fi}sh ''; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/rustic-rs/rustic"; changelog = "https://github.com/rustic-rs/rustic/blob/${src.rev}/changelog/${version}.txt"; From f9adb566707a492bd3d17fee1e223695d939b52a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 9 Apr 2023 12:08:42 +0200 Subject: [PATCH 123/169] =?UTF-8?q?ocamlPackages.hpack:=200.9.0=20?= =?UTF-8?q?=E2=86=92=200.10.0=20(#225270)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ocamlPackages.hpack: 0.9.0 → 0.10.0 ocamlPackages.paf: 0.4.0 → 0.5.0 ocamlPackages.http-mirage-client: 0.0.2 → 0.0.3 * ocamlPackages.httpaf: use Dune 3 --- .../ocaml-modules/hpack/default.nix | 7 +-- .../http-mirage-client/default.nix | 13 +----- .../ocaml-modules/httpaf/default.nix | 7 +-- pkgs/development/ocaml-modules/paf/cohttp.nix | 1 - .../development/ocaml-modules/paf/default.nix | 13 +----- pkgs/development/ocaml-modules/paf/le.nix | 44 ------------------- pkgs/top-level/ocaml-packages.nix | 2 - 7 files changed, 12 insertions(+), 75 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/paf/le.nix diff --git a/pkgs/development/ocaml-modules/hpack/default.nix b/pkgs/development/ocaml-modules/hpack/default.nix index 5ebb14f30b88..20a0456d7449 100644 --- a/pkgs/development/ocaml-modules/hpack/default.nix +++ b/pkgs/development/ocaml-modules/hpack/default.nix @@ -7,14 +7,15 @@ buildDunePackage rec { pname = "hpack"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz"; - sha256 = "sha256-7gjRhJs2mufQbImAXiKFT9mZ1kHGSHHwjCVZM5f0C14="; + hash = "sha256-n9avpVL6HD2KBON2FpnUeuH3HOUDOA29iSmjdcxMRvE="; }; - minimalOCamlVersion = "4.04"; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ angstrom diff --git a/pkgs/development/ocaml-modules/http-mirage-client/default.nix b/pkgs/development/ocaml-modules/http-mirage-client/default.nix index 08b3758d53ed..434482bdc3bc 100644 --- a/pkgs/development/ocaml-modules/http-mirage-client/default.nix +++ b/pkgs/development/ocaml-modules/http-mirage-client/default.nix @@ -1,6 +1,5 @@ { lib , fetchurl -, fetchpatch , buildDunePackage , h2 , httpaf @@ -17,24 +16,16 @@ buildDunePackage rec { pname = "http-mirage-client"; - version = "0.0.2"; + version = "0.0.3"; duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz"; - hash = "sha256-stom13t3Kn1ehkeURem39mxhd3Lmlz8z9m3tHGcp5vY="; + hash = "sha256-6PMxZQfPiDTFbj9gOO2tW5FHF0MUP5tOySjkYg+QwGA="; }; - # Make tests use mirage-crypto - patches = lib.lists.map fetchpatch [ - { url = "https://github.com/roburio/http-mirage-client/commit/c6cd38db9c23ac23e7c3e4cf2d41420f58034e8d.patch"; - hash = "sha256-b3rurqF0DxLpVQEhVfROwc7qyul0Fjfl3zhD8AkzemU="; } - { url = "https://github.com/roburio/http-mirage-client/commit/0a5367e7c6d9b7f45c88493f7a596f7a83e8c7d5.patch"; - hash = "sha256-Q6YlfuiAfsyhty9EvoBetvekuU25KjrH5wwGwYTAAiA="; } - ]; - propagatedBuildInputs = [ h2 httpaf diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix index 508b2e4b7f76..f262d51ee7dc 100644 --- a/pkgs/development/ocaml-modules/httpaf/default.nix +++ b/pkgs/development/ocaml-modules/httpaf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, ocaml +{ lib, fetchFromGitHub, fetchpatch, buildDunePackage , angstrom, faraday, alcotest }: @@ -6,7 +6,8 @@ buildDunePackage rec { pname = "httpaf"; version = "0.7.1"; - useDune2 = true; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "inhabitedtype"; @@ -17,7 +18,7 @@ buildDunePackage rec { checkInputs = [ alcotest ]; propagatedBuildInputs = [ angstrom faraday ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; meta = { description = "A high-performance, memory-efficient, and scalable web server for OCaml"; diff --git a/pkgs/development/ocaml-modules/paf/cohttp.nix b/pkgs/development/ocaml-modules/paf/cohttp.nix index e7e0273e5234..2f2891493061 100644 --- a/pkgs/development/ocaml-modules/paf/cohttp.nix +++ b/pkgs/development/ocaml-modules/paf/cohttp.nix @@ -22,7 +22,6 @@ buildDunePackage { inherit (paf) version src - patches ; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix index 6345499ca283..3fddb162d465 100644 --- a/pkgs/development/ocaml-modules/paf/default.nix +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -1,7 +1,6 @@ { buildDunePackage , lib , fetchurl -, fetchpatch , mirage-stack , mirage-time , h2 @@ -25,21 +24,13 @@ buildDunePackage rec { pname = "paf"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz"; - hash = "sha256-ux8fk4XDdih4Ua9NGOJVSuPseJBPv6+6ND/esHrluQE="; + hash = "sha256-oWRvwb8DhtF3ltWaZ6moKmgadFUngruo1UOIaGNV/oM="; }; - patches = [ - # Compatibility with mirage-crypto 0.11.0 - (fetchpatch { - url = "https://github.com/dinosaure/paf-le-chien/commit/2f308c1c4d3ff49d42136f8ff86a4385661e4d1b.patch"; - hash = "sha256-jmSeUpoRoUMPUNEH3Av2LxgRZs+eAectK+CpoH+SdpY="; - }) - ]; - minimalOCamlVersion = "4.08"; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/paf/le.nix b/pkgs/development/ocaml-modules/paf/le.nix deleted file mode 100644 index a31575d4690b..000000000000 --- a/pkgs/development/ocaml-modules/paf/le.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildDunePackage -, paf -, dns-client-mirage -, duration -, emile -, httpaf -, letsencrypt -, mirage-stack -, mirage-time -, tls-mirage -, x509 -}: - -buildDunePackage { - pname = "paf-le"; - - inherit (paf) - version - src - patches - ; - - duneVersion = "3"; - - propagatedBuildInputs = [ - paf - dns-client-mirage - duration - emile - httpaf - letsencrypt - mirage-stack - mirage-time - tls-mirage - x509 - ]; - - doCheck = true; - - meta = paf.meta // { - description = "A CoHTTP client with its HTTP/AF implementation"; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index bbe5c59e1f48..4ce6162788d3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1259,8 +1259,6 @@ let paf-cohttp = callPackage ../development/ocaml-modules/paf/cohttp.nix { }; - paf-le = callPackage ../development/ocaml-modules/paf/le.nix { }; - parany = callPackage ../development/ocaml-modules/parany { }; parmap = callPackage ../development/ocaml-modules/parmap { }; From 9b6158e09257dffe2dd85b60c925fe0144bc1c91 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Apr 2023 12:29:12 +0200 Subject: [PATCH 124/169] python310Packages.aioambient: 2022.10.0 -> 2023.04.0 https://github.com/bachya/aioambient/releases/tag/2023.04.0 --- pkgs/development/python-modules/aioambient/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix index b7fbf9af5dd2..15d3d7ae5617 100644 --- a/pkgs/development/python-modules/aioambient/default.nix +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aioambient"; - version = "2022.10.0"; + version = "2023.04.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,13 +24,12 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Oppi4J0TuLbqwVn1Hpa4xcU9c/I+YDP3E0VXwiP8a/w="; + hash = "sha256-ar2UGSlVukMD5EZsEn7TFfIOovaI+B3Ym+UeGo95oks="; }; postPatch = '' - # https://github.com/bachya/aioambient/pull/97 substituteInPlace pyproject.toml \ - --replace 'websockets = ">=9.1,<11.0"' 'websockets = "*"' + --replace 'websockets = ">=11.0.1"' 'websockets = "*"' ''; nativeBuildInputs = [ From 8a287701c0cf2f68ef03c183776b41f79905ee7c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Apr 2023 12:30:06 +0200 Subject: [PATCH 125/169] python310Packages.env-canada: 0.5.30 -> 0.5.31 https://github.com/michaeldavie/env_canada/blob/v0.5.31/CHANGELOG.md --- pkgs/development/python-modules/env-canada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 297dbbd8af90..c32c81555d78 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.30"; + version = "0.5.31"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-bwoLxE47rLr7KNv0qEHjqKf5PJxBNdkaGLf86diTnKo="; + hash = "sha256-68pHCsY2smaS1nO+fWN1tXy7VyhXcbYzoGmA1cAN5h4="; }; propagatedBuildInputs = [ From d450698227a3c9d133e509ef6d0a790463dba140 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Apr 2023 12:31:35 +0200 Subject: [PATCH 126/169] python310Packages.flux-led: 0.28.36 -> 0.28.37 https://github.com/Danielhiversen/flux_led/releases/tag/0.28.37 --- pkgs/development/python-modules/flux-led/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index a7af6aa70cd4..2e5502966f62 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.36"; + version = "0.28.37"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = "refs/tags/${version}"; - hash = "sha256-UoWeVLsfc8rK3U7zaF8bKXk/XdrgT6F3biNe/UFq/rE="; + hash = "sha256-3SlgYENtyv0JdUwGFpT3lWUDOciAKThYGz/RV8z+tac="; }; propagatedBuildInputs = [ From 59ef9d5fc8408dfeec1762c106c5c944e38bd4fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Apr 2023 12:31:54 +0200 Subject: [PATCH 127/169] python310Packages.gcal-sync: 4.1.3 -> 4.1.4 https://github.com/allenporter/gcal_sync/releases/tag/4.1.4 --- pkgs/development/python-modules/gcal-sync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index 0d27dc380847..4e74e5666893 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "4.1.3"; + version = "4.1.4"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-NfgR+X77cuhXCy55Bx9ecP8vN8zs2coexcnCsQ4SbfU="; + hash = "sha256-LJJyJj1HXNdBBs4hDvkuz74PDHRpeVpwbq0vSfESuXY="; }; propagatedBuildInputs = [ From ce5b6aba7ccb0eb94a8d5fd2e977897fe8fb4192 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Apr 2023 12:35:13 +0200 Subject: [PATCH 128/169] python310Packages.amqtt: Relax websockets constraint --- pkgs/development/python-modules/amqtt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix index 9da8d6f204ba..b25c1fa46ed2 100644 --- a/pkgs/development/python-modules/amqtt/default.nix +++ b/pkgs/development/python-modules/amqtt/default.nix @@ -32,7 +32,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'transitions = "^0.8.0"' 'transitions = "*"' + --replace 'transitions = "^0.8.0"' 'transitions = "*"' \ + --replace 'websockets = ">=9.0,<11.0"' 'websockets = "*"' ''; nativeBuildInputs = [ From bb2e919ee791b08269215e256265dc2b0b4f00a3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Apr 2023 12:39:23 +0200 Subject: [PATCH 129/169] python310Packages.roombapy: 1.6.7 -> 1.6.8 https://github.com/pschmitt/roombapy/releases/tag/1.6.8 --- .../python-modules/roombapy/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix index 9a7642318aa1..075bf6ba084c 100644 --- a/pkgs/development/python-modules/roombapy/default.nix +++ b/pkgs/development/python-modules/roombapy/default.nix @@ -2,6 +2,7 @@ , amqtt , buildPythonPackage , fetchFromGitHub +, orjson , paho-mqtt , poetry-core , pytest-asyncio @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "roombapy"; - version = "1.6.7"; + version = "1.6.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,14 +21,24 @@ buildPythonPackage rec { owner = "pschmitt"; repo = "roombapy"; rev = "refs/tags/${version}"; - hash = "sha256-cZoHUup3Znna4Za5twYyua3r03InapzU4c1aRrG6rpo="; + hash = "sha256-z9D9FiE+14/x05AFu3EpBYlAqpDPc5y6S+pLTsSO0cU="; }; + postPatch = '' + # hbmqtt was replaced by amqtt + substituteInPlace tests/test_roomba_integration.py \ + --replace "from hbmqtt.broker import Broker" "from amqtt.broker import Broker" + + substituteInPlace pyproject.toml \ + --replace 'orjson = ">=3.8.7"' 'orjson = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ + orjson paho-mqtt ]; @@ -37,12 +48,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # hbmqtt was replaced by amqtt - substituteInPlace tests/test_roomba_integration.py \ - --replace "from hbmqtt.broker import Broker" "from amqtt.broker import Broker" - ''; - disabledTestPaths = [ # Requires network access "tests/test_discovery.py" From f56e0dc6b1949dfcc996418e562c71edbd4f650a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Apr 2023 22:06:27 +0200 Subject: [PATCH 130/169] python310Packages.subarulink: 0.7.5 -> 0.7.6 Diff: https://github.com/G-Two/subarulink/compare/refs/tags/v0.7.5...v0.7.6 Changelog: https://github.com/G-Two/subarulink/releases/tag/v0.7.6 --- pkgs/development/python-modules/subarulink/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 3a822611d1bd..42af75533dd1 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -1,6 +1,5 @@ { lib , aiohttp -, asynctest , buildPythonPackage , cryptography , fetchFromGitHub @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.7.5"; + version = "0.7.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +20,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lvL/bRHvQvvYqr+qzrWe7dOscYFGVA2OrVt/RPGdmzA="; + hash = "sha256-D2nwzj7uYL/v5Ew2+LfJBLH904Htam4Fa3Gs6t8Hbyo="; }; propagatedBuildInputs = [ @@ -30,7 +29,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest cryptography pytest-asyncio pytestCheckHook From 2409362d04a7645c9abda0255de6b2bc9476e6bc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Apr 2023 12:45:41 +0200 Subject: [PATCH 131/169] python310Packages.zeroconf: 0.54.0 -> 0.56.0 https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.56.0 Build optional cython implementation, reenable tests on darwin and prune disabled tests. --- .../python-modules/zeroconf/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index accd4be9da12..05a20e62693a 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -1,11 +1,13 @@ { lib , stdenv +, cython , async-timeout , buildPythonPackage , fetchFromGitHub , ifaddr , poetry-core , pytest-asyncio +, pytest-timeout , pythonOlder , pytestCheckHook , setuptools @@ -13,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.54.0"; + version = "0.56.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,24 +24,24 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-rbolWawEbjF46Im/mqyOHpvk+4UojgFIaFoG4jbPwYY="; + hash = "sha256-EglL06umgKjbA7mWuOfss7xemp53XJNOs3eJR5VNWxk="; }; nativeBuildInputs = [ + cython poetry-core setuptools ]; propagatedBuildInputs = [ - async-timeout ifaddr + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; - # OSError: [Errno 48] Address already in use - doCheck = !stdenv.isDarwin; - nativeCheckInputs = [ pytest-asyncio + pytest-timeout pytestCheckHook ]; @@ -48,17 +50,12 @@ buildPythonPackage rec { ''; disabledTests = [ - # tests that require network interaction + # OSError: [Errno 19] No such device "test_close_multiple_times" + "test_integration_with_listener_ipv6" "test_launch_and_close" "test_launch_and_close_context_manager" "test_launch_and_close_v4_v6" - "test_launch_and_close_v6_only" - "test_integration_with_listener_ipv6" - # Starting with 0.39.0: AssertionError: assert [('add', '_ht..._tcp.local.')] - "test_service_browser_expire_callbacks" - ] ++ lib.optionals stdenv.isDarwin [ - "test_lots_of_names" ]; __darwinAllowLocalNetworking = true; @@ -71,7 +68,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/python-zeroconf/python-zeroconf/releases/tag/${version}"; description = "Python implementation of multicast DNS service discovery"; - homepage = "https://github.com/jstasiak/python-zeroconf"; + homepage = "https://github.com/python-zeroconf/python-zeroconf"; license = licenses.lgpl21Only; maintainers = with maintainers; [ abbradar ]; }; From c4041418d53276e59b109da780aebba3b6969b7d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Apr 2023 13:10:06 +0200 Subject: [PATCH 132/169] python310Packages.zha-quirks: 0.0.95 -> 0.0.96 https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.96 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index f87d36298003..b6fef9fc8e0e 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.95"; + version = "0.0.96"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-LCO4jLwPqPDOoKdzay7cKuAv36UZ+OGu39AoBj6iqpY="; + hash = "sha256-GqKQPOP3cJe4UyE5OsLCjNVPT8YKsJ0q8ApsJsAk4uw="; }; propagatedBuildInputs = [ From a6f15abc955e6bf2b800b7d6a68966ee53130c7f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Apr 2023 13:14:28 +0200 Subject: [PATCH 133/169] home-assistant: 2023.4.1 -> 2023.4.2 https://github.com/home-assistant/core/releases/tag/2023.4.2 --- .../home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 25 +++++++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a8576f117672..b0d56acfc1fc 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.4.1"; + version = "2023.4.2"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index dbca73d35ee3..359d7c1d1a47 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -109,6 +109,11 @@ let }; }); + # moto tests are a nuissance + moto = super.moto.overridePythonAttrs (_: { + doCheck = false; + }); + # Pinned due to API changes in 1.3.0 ovoenergy = super.ovoenergy.overridePythonAttrs (oldAttrs: rec { version = "1.2.0"; @@ -208,11 +213,11 @@ let }); sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "2.0.6"; + version = "2.0.9"; src = super.fetchPypi { pname = "SQLAlchemy"; inherit version; - hash = "sha256-w0PwtUZJX116I5xwv1CpmkjXMhwWW4Kvr6hIO56+v24="; + hash = "sha256-lXGSFePscze59Xw8LtoOanYZvhlKUWbAfB5Zn2r8IPo="; }; }); @@ -249,6 +254,16 @@ let }; }); + websockets = super.websockets.overridePythonAttrs (oldAttrs: rec { + version = "11.0.1"; + src = fetchFromGitHub { + owner = "aaugustin"; + repo = "websockets"; + rev = "refs/tags/${version}"; + hash = "sha256-cD8pC7n2OGS8AjG0VdjNXi8jXxvN7yKkadNR0GCqc90="; + }; + }); + # internal python packages only consumed by home-assistant itself home-assistant-frontend = self.callPackage ./frontend.nix { }; home-assistant-intents = self.callPackage ./intents.nix { }; @@ -273,7 +288,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.4.1"; + hassVersion = "2023.4.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -289,7 +304,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-p9dR8q9eWxDGo+cBXO0zd9MFdB7pFeAfLfudHsYxcK8="; + hash = "sha256-Fl8CxHK8Gg4wf+kyptyiLZx8MG/eI5kTr+pSLEl729I="; }; # Secondary source is git for tests @@ -297,7 +312,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-TSTn2o37XMmcU4XCPCMwvRNWW7BUadcfbK7NU/ulsNE="; + hash = "sha256-XCxFi7ts4KQdKl68YP4Ps60SWW22NoNuoGFo50xbl8s="; }; nativeBuildInputs = with python3.pkgs; [ From f6bae434a2030ad8c9042ea7035e2f200090c38c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Apr 2023 14:37:11 +0200 Subject: [PATCH 134/169] python310Packages.gql: Relax websockets constraint --- pkgs/development/python-modules/gql/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix index 4d4146968cbe..629f5413dff3 100644 --- a/pkgs/development/python-modules/gql/default.nix +++ b/pkgs/development/python-modules/gql/default.nix @@ -34,6 +34,12 @@ buildPythonPackage rec { hash = "sha256-yr8IyAwZ6y2MPTe6bHRW+CIp19R3ZJWHuqdN5qultnQ="; }; + postPatch = '' + substituteInPlace setup.py --replace \ + "websockets>=10,<11;python_version>'3.6'" \ + "websockets>=10,<12;python_version>'3.6'" + ''; + propagatedBuildInputs = [ backoff graphql-core From 3a22bccf6388aafa95c6e183896c7512377cec80 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Apr 2023 15:38:17 +0200 Subject: [PATCH 135/169] python310Packages.homeassistant-stubs: 2023.4.0 -> 2023.4.2 https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.4.2 --- 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 1a8d7e5e5091..1dca06b1043b 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.4.0"; + version = "2023.4.2"; 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-Gu65PlRjAqKK6BdzNjcHeRy4Cqr6z2o+PRwmDFkSlMA="; + hash = "sha256-FzcgGyYtmU8owlvUfP/D+Y6m5QwOWj4njoLTZX6skLE="; }; nativeBuildInputs = [ From 6b2b317f70a73b09df240a212a0feccb60f21195 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Apr 2023 14:02:43 +0000 Subject: [PATCH 136/169] o: 2.58.0 -> 2.60.5 --- pkgs/applications/editors/o/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/o/default.nix b/pkgs/applications/editors/o/default.nix index 18654f3901e6..2415ddd28909 100644 --- a/pkgs/applications/editors/o/default.nix +++ b/pkgs/applications/editors/o/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "o"; - version = "2.58.0"; + version = "2.60.5"; src = fetchFromGitHub { owner = "xyproto"; repo = "o"; rev = "v${version}"; - hash = "sha256-oYWlciTQ/4mm/gTSQEkD/xPeLfDjIAMksjj1DVodZW4="; + hash = "sha256-gCE4mrZXLFteZKUPDsAc1hS1I/WTns9I9oZE5bAF7fU="; }; - vendorSha256 = null; + vendorHash = null; postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile \ From d5da6e90a054e1973c3e8fa9452f15ec82bcd972 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Apr 2023 12:04:33 +0000 Subject: [PATCH 137/169] crosvm: 111.1 -> 112.0 --- pkgs/applications/virtualization/crosvm/default.nix | 8 ++++---- pkgs/applications/virtualization/crosvm/update.py | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 8d3c2dedd13a..6e7010b5102b 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -4,18 +4,18 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "111.1"; + version = "112.0"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "9ad89972330f70fca5a29967f226cf905977bf7f"; - sha256 = "hvP3V7kzfPXOIe+6GBWupfhW5SM3ifoqmx7dyTgSTeU="; + rev = "014b853ebdba00c7bad751a37fa4271ff2a50d77"; + sha256 = "qVfkNN6dHfMeDYMDvccU9PAz78Dh2ylL6UpoApoYKJw="; fetchSubmodules = true; }; separateDebugInfo = true; - cargoSha256 = "S8zeOB+S5ZTuHqWNjxDIa4ev24ose/fByYwPrhR9OY8="; + cargoSha256 = "ath0x9dfQCWWU9+zKyYLC6Q/QXupifHhdQxrS+N2UWw="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner diff --git a/pkgs/applications/virtualization/crosvm/update.py b/pkgs/applications/virtualization/crosvm/update.py index 7a94aedefdb6..62e195d3426f 100755 --- a/pkgs/applications/virtualization/crosvm/update.py +++ b/pkgs/applications/virtualization/crosvm/update.py @@ -27,6 +27,8 @@ with urlopen('https://chromiumdash.appspot.com/cros/download_serving_builds_csv? platform_version = [] for line in reader: + if line[cr_stable_index] == "no update": + continue this_chrome_version = list(map(int, line[cr_stable_index].split('.'))) this_platform_version = list(map(int, line[cros_stable_index].split('.'))) chrome_version = max(chrome_version, this_chrome_version) From 3c384353a64ee069240af601aa6781bb556351cf Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 6 Apr 2023 10:18:49 +0000 Subject: [PATCH 138/169] qemu: 7.2.0 -> 7.2.1 --- pkgs/applications/virtualization/qemu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a7a71977c4ae..1b952a858233 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { + lib.optionalString xenSupport "-xen" + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { url = "https://download.qemu.org/qemu-${version}.tar.xz"; - sha256 = "sha256-W0nOJod0Ta1JSukKiYxSIEo0BuhNBySCoeG+hU7rIVc="; + sha256 = "jIVpms+dekOl/immTN1WNwsMLRrQdLr3CYqCTReq1zs="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { preConfigure = '' unset CPP # intereferes with dependency calculation # this script isn't marked as executable b/c it's indirectly used by meson. Needed to patch its shebang - chmod +x ./scripts/shaderinclude.pl + chmod +x ./scripts/shaderinclude.py patchShebangs . # avoid conflicts with libc++ include for mv VERSION QEMU_VERSION From c5ef4af03f4838cb38d4c1c37b8d3d2a4c683407 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 14 Mar 2023 11:06:31 -0400 Subject: [PATCH 139/169] factorio: Formatting Format with nixpkgs-fmt and alphabetize. --- pkgs/games/factorio/default.nix | 110 +++++++++++++++++++------------- 1 file changed, 67 insertions(+), 43 deletions(-) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 41dd9625adb8..5706c2228435 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -1,17 +1,33 @@ -{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem -, alsa-lib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL -, libSM, libICE, libXext, factorio-utils +{ lib +, alsa-lib +, factorio-utils +, fetchurl +, libGL +, libICE +, libSM +, libX11 +, libXcursor +, libXext +, libXi +, libXinerama +, libXrandr +, libpulseaudio +, makeDesktopItem +, makeWrapper , releaseType -, mods ? [] +, stdenv + +, mods ? [ ] , mods-dat ? null , versionsJson ? ./versions.json -, username ? "", token ? "" # get/reset token at https://factorio.com/profile +, username ? "" +, token ? "" # get/reset token at https://factorio.com/profile , experimental ? false # true means to always use the latest branch }: assert releaseType == "alpha" - || releaseType == "headless" - || releaseType == "demo"; + || releaseType == "headless" + || releaseType == "demo"; let @@ -68,16 +84,17 @@ let actual = binDists.${stdenv.hostPlatform.system}.${releaseType}.${branch} or (throw "Factorio ${releaseType}-${branch} binaries for ${stdenv.hostPlatform.system} are not available for download."); makeBinDists = versions: - let f = path: name: value: - if builtins.isAttrs value then - if value ? "name" then - makeBinDist value + let + f = path: name: value: + if builtins.isAttrs value then + if value ? "name" then + makeBinDist value + else + builtins.mapAttrs (f (path ++ [ name ])) value else - builtins.mapAttrs (f (path ++ [ name ])) value - else - throw "expected attrset at ${toString path} - got ${toString value}"; + throw "expected attrset at ${toString path} - got ${toString value}"; in - builtins.mapAttrs (f []) versions; + builtins.mapAttrs (f [ ]) versions; makeBinDist = { name, version, tarDirectory, url, sha256, needsAuth }: { inherit version tarDirectory; src = @@ -89,26 +106,29 @@ let inherit name url sha256; curlOptsList = [ "--get" - "--data-urlencode" "username@username" - "--data-urlencode" "token@token" + "--data-urlencode" + "username@username" + "--data-urlencode" + "token@token" ]; }) - (_: { # This preHook hides the credentials from /proc - preHook = - if username != "" && token != "" then '' - echo -n "${username}" >username - echo -n "${token}" >token - '' else '' - # Deliberately failing since username/token was not provided, so we can't fetch. - # We can't use builtins.throw since we want the result to be used if the tar is in the store already. - exit 1 - ''; - failureHook = '' - cat <username + echo -n "${token}" >token + '' else '' + # Deliberately failing since username/token was not provided, so we can't fetch. + # We can't use builtins.throw since we want the result to be used if the tar is in the store already. + exit 1 + ''; + failureHook = '' + cat < Date: Tue, 14 Mar 2023 11:09:40 -0400 Subject: [PATCH 140/169] factorio: Add Wayland support Factorio 1.1.77 adds Wayland support, so make the necessary libs available. https://forums.factorio.com/viewtopic.php?p=582261 --- pkgs/games/factorio/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 5706c2228435..97df1c6c249b 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -12,10 +12,12 @@ , libXinerama , libXrandr , libpulseaudio +, libxkbcommon , makeDesktopItem , makeWrapper , releaseType , stdenv +, wayland , mods ? [ ] , mods-dat ? null @@ -217,6 +219,8 @@ let libXinerama libXrandr libpulseaudio + libxkbcommon + wayland ]; installPhase = base.installPhase + '' From c6b49b60f5c400caefdfc16959ef263f06e3c293 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Apr 2023 15:53:17 +0000 Subject: [PATCH 141/169] python310Packages.casbin: 1.18.0 -> 1.18.2 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 5bfde7f67b1c..e42a6c828bb5 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.18.0"; + version = "1.18.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-NB8WJJ/cZF4fbgWtU7wM0IplJ98K195Q0WcQ632Ha6U="; + hash = "sha256-oI+w9EoNgKnR+7pgvwTmsRpOQI0TxzCx8TjfSEmO7mc="; }; propagatedBuildInputs = [ From bfc6014c6dd1254482ed07e278a0a678047706c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Apr 2023 15:58:30 +0000 Subject: [PATCH 142/169] python310Packages.gspread: 5.7.2 -> 5.8.0 --- pkgs/development/python-modules/gspread/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index c38746299c5d..966d7c6074bf 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "gspread"; - version = "5.7.2"; + version = "5.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-znb5wWuIzLeSNQFCIkpZr6jmn3Rj89NBcUjL6JLvx8s="; + hash = "sha256-+XOeK4Odf6H4pfDPDU7mjHduL79L/jFnrS6RC9WI+0Q="; }; propagatedBuildInputs = [ From 018dc1da67f832a2834cd02db43263f599c65fb4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Apr 2023 16:04:26 +0000 Subject: [PATCH 143/169] cudatext: 1.189.0 -> 1.190.1 --- pkgs/applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 6f897ad39262..ddbf234aee16 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.189.0"; + version = "1.190.1"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-adSX/J/p6E6vz7O5Cg3DgYQjrJYaEcOhYSDQqii68eg="; + hash = "sha256-JnFvbCSDRkw2/BXoSCB9IcB5hwrhB+hvS1xLj5eAQbs="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 364d22e98ad6..6e8086a543e6 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -16,23 +16,23 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.03.28", - "hash": "sha256-24WOYnPb5MyEXHv3+E2MDisE5aHCTopulyqD2NFMaQU=" + "rev": "2023.04.08", + "hash": "sha256-FBrb/2VwmpM6FCUvHXZTJCsn/a9r3qPNBYVWyN5CS5o=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2023.03.28", - "hash": "sha256-nY3f72xK8luBQuFSCE7r+tP9Y3on8K4ULKW5WfKOs7E=" + "rev": "2023.04.08", + "hash": "sha256-xm2fMAm0DF0hILxBQ2m+OSodQQgl5a4rkW0pgTDjuoo=" }, "EControl": { "owner": "Alexey-T", - "rev": "2023.03.28", - "hash": "sha256-kaQAoNP9gRzkQsaQHBiMt6KheuTg/2cnWwUClPy8xoY=" + "rev": "2023.04.04", + "hash": "sha256-BLj37uTHB4T0ek97u7hYqxbUjW71efGBKGG35CEyLR8=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2023.03.28", - "hash": "sha256-fisjVB0AtqW24ZO6LIO5FKlTdoe8/zxnfuaEilllbVw=" + "rev": "2023.04.04", + "hash": "sha256-bqNq1tzZjzwMw3I6G5kuFeh7qp33DGo4gu4BVd4pONk=" }, "Python-for-Lazarus": { "owner": "Alexey-T", From 97e9e9afceaa12120d7540230a59b398dc8f9ec9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 18:14:55 +0200 Subject: [PATCH 144/169] zeekscript: init at 1.2.1 --- pkgs/tools/security/zeekscript/default.nix | 35 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/security/zeekscript/default.nix diff --git a/pkgs/tools/security/zeekscript/default.nix b/pkgs/tools/security/zeekscript/default.nix new file mode 100644 index 000000000000..cf5e44ea8f68 --- /dev/null +++ b/pkgs/tools/security/zeekscript/default.nix @@ -0,0 +1,35 @@ +{ lib +, python3 +, fetchPypi +}: + +python3.pkgs.buildPythonApplication rec { + pname = "zeekscript"; + version = "1.2.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LogI9sJHvLN5WHJGdW47D09XZInKln/I2hNmG62d1JU="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + tree-sitter + ]; + + pythonImportsCheck = [ + "zeekscript" + ]; + + meta = with lib; { + description = "A Zeek script formatter and analyzer"; + homepage = "https://github.com/zeek/zeekscript"; + changelog = "https://github.com/zeek/zeekscript/blob/v${version}/CHANGES"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab tobim ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7afeef86bd2c..e972717adf52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7080,6 +7080,8 @@ with pkgs; zeek = callPackage ../applications/networking/ids/zeek { }; + zeekscript = callPackage ../tools/security/zeekscript { }; + zoekt = callPackage ../tools/text/zoekt { }; zonemaster-cli = perlPackages.ZonemasterCLI; From 633ed6e9ffd3e02c289cbd2d9d39e75dfcc7e447 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sun, 9 Apr 2023 09:27:11 +0200 Subject: [PATCH 145/169] calibre: 6.11.0 -> 6.15.1 https://github.com/kovidgoyal/calibre/releases/tag/v6.15.1 --- pkgs/applications/misc/calibre/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index a6ea64724051..70f5f16f39c2 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "calibre"; - version = "6.11.0"; + version = "6.15.1"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-ylOZ5ljA5uBb2bX/qFhsmPQW6dJVEH9jxQaR2u8C4Wc="; + hash = "sha256-t9fG1hBlQmDh0i5ezBoqk9C9oliNNF0peKDz1YH7RBo="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { # allow for plugin update check, but no calibre version check (fetchpatch { name = "0001-only-plugin-update.patch"; - url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch"; + url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}-1/debian/patches/0001-only-plugin-update.patch"; hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ="; }) (fetchpatch { - name = "0007-Hardening-Qt-code.patch"; - url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0007-Hardening-Qt-code.patch"; - hash = "sha256-CutVTb7K4tjewq1xAjHEGUHFcuuP/Z4FFtj4xQb4zKQ="; + name = "0006-Hardening-Qt-code.patch"; + url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}-1/debian/patches/0006-Hardening-Qt-code.patch"; + hash = "sha256-9P1kGrQbWAWDzu5EUiQr7TiCPHRWUA8hxPpEvFpK20k="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; From a1ad820020ce72dd9a580cfe37c293244143eefe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Apr 2023 14:18:50 +0000 Subject: [PATCH 146/169] juicefs: 1.0.3 -> 1.0.4 --- pkgs/tools/filesystems/juicefs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix index 193bc25fbc91..3ffa678e3995 100644 --- a/pkgs/tools/filesystems/juicefs/default.nix +++ b/pkgs/tools/filesystems/juicefs/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "juicefs"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "juicedata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zGVOodjNPH/vCIBEjXo3MTg8McybakMv7tg0Y9ahasU="; + sha256 = "sha256-Bez9wwAPDyYYECDwW9CB/ACTGUJl6PW3YiipIGY0Zbo="; }; - vendorSha256 = "sha256-YzFGqn9r06TEMiKuuUbUkoacFpsAOPopX9MNB4mlTIM="; + vendorHash = "sha256-dsKNFIXcSeYUyh1TO1h1Ze3jS97pdhn2eU9hHjTARCo="; ldflags = [ "-s" "-w" ]; From b96d7b5eadbd507def3d49492265b886309cbb12 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 9 Apr 2023 19:52:14 +0400 Subject: [PATCH 147/169] o: rename to orbiton --- pkgs/applications/editors/{o => orbiton}/default.nix | 8 +++++--- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 7 insertions(+), 6 deletions(-) rename pkgs/applications/editors/{o => orbiton}/default.nix (87%) diff --git a/pkgs/applications/editors/o/default.nix b/pkgs/applications/editors/orbiton/default.nix similarity index 87% rename from pkgs/applications/editors/o/default.nix rename to pkgs/applications/editors/orbiton/default.nix index 2415ddd28909..ec8eb24073c2 100644 --- a/pkgs/applications/editors/o/default.nix +++ b/pkgs/applications/editors/orbiton/default.nix @@ -3,12 +3,12 @@ }: buildGoModule rec { - pname = "o"; + pname = "orbiton"; version = "2.60.5"; src = fetchFromGitHub { owner = "xyproto"; - repo = "o"; + repo = "orbiton"; rev = "v${version}"; hash = "sha256-gCE4mrZXLFteZKUPDsAc1hS1I/WTns9I9oZE5bAF7fU="; }; @@ -33,6 +33,7 @@ buildGoModule rec { postInstall = '' cd .. installManPage o.1 + mv $out/bin/{orbiton,o} '' + lib.optionalString withGui '' make install-gui PREFIX=$out wrapProgram $out/bin/og --prefix PATH : $out/bin @@ -40,8 +41,9 @@ buildGoModule rec { meta = with lib; { description = "Config-free text editor and IDE limited to VT100"; - homepage = "https://github.com/xyproto/o"; + homepage = "https://github.com/xyproto/orbiton"; license = licenses.bsd3; maintainers = with maintainers; [ sikmir ]; + mainProgram = "o"; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c124bc27d21b..1cbf0e22fad7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1121,6 +1121,7 @@ mapAliases ({ ### O ### + o = orbiton; # Added 2023-04-09 oathToolkit = oath-toolkit; # Added 2022-04-04 oci-image-tool = throw "oci-image-tool is no longer actively maintained, and has had major deficiencies for several years."; # Added 2022-05-14; oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained"; # Added 2020-10-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c475a781e22d..5acc121a148c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29678,9 +29678,7 @@ with pkgs; edlin = callPackage ../applications/editors/edlin { }; - o = callPackage ../applications/editors/o { - buildGoModule = buildGo119Module; # go 1.20 build failure - }; + orbiton = callPackage ../applications/editors/orbiton { }; oed = callPackage ../applications/editors/oed { }; From 97795088e99574b53dfe344d8819497a92dcfe97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Apr 2023 16:51:56 +0000 Subject: [PATCH 148/169] brev-cli: 0.6.213 -> 0.6.215 --- pkgs/development/misc/brev-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 8b724f45eb27..753d0ececb12 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.213"; + version = "0.6.215"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ABYTOS+pBhlojrZw6V1GEaJJOl4x7GgZfULanBvxuy4="; + sha256 = "sha256-Yv59F3i++l6UA8J3l3pyyaeagAcPIqsAWBlSojxjflg="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; From 7b198bc8e67970510410e04690577c3c64ecfca2 Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 3 Mar 2023 11:48:46 +0000 Subject: [PATCH 149/169] maintainers: add nicoo --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e2f10fa6d578..455f8a518758 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10771,6 +10771,15 @@ githubId = 8214542; name = "Nicolò Balzarotti"; }; + nicoo = { + email = "nicoo@debian.org"; + github = "nbraud"; + githubId = 1155801; + name = "nicoo"; + keys = [{ + fingerprint = "E44E 9EA5 4B8E 256A FB73 49D3 EC9D 3708 72BC 7A8C"; + }]; + }; nidabdella = { name = "Mohamed Nidabdella"; email = "nidabdella.mohamed@gmail.com"; From 03417384e1837294e78d0cf41043d8c2b23eee52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Apr 2023 15:15:51 +0000 Subject: [PATCH 150/169] spotify-player: 0.12.1 -> 0.13.1 --- pkgs/applications/audio/spotify-player/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index df4cf7af4942..442cbc311243 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.12.1"; + version = "0.13.1"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KHbeCnsdHP7Zsj9KeVLuumcVOW6m7Tz1GgBBQ25Rbyo="; + hash = "sha256-c+CbIDg4WlzRStiA+yBkjfSmMJ183tLBGiK340bZgnA="; }; - cargoHash = "sha256-51xKCiGdvJ8k9ArWBCazJGgRljqHxZiyTdes4i7JZH8="; + cargoHash = "sha256-nhRXFxSrzkq3SdJ4ZmWlKl7SwxwOz6ZYboIsBmgdFJ8="; nativeBuildInputs = [ pkg-config From 5359173eab5cd98ed24f3af990bb7c18bfcf88e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Apr 2023 18:21:38 +0000 Subject: [PATCH 151/169] python310Packages.spyder-kernels: 2.4.2 -> 2.4.3 --- pkgs/development/python-modules/spyder-kernels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 34806520073f..5ad7575c247c 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.4.2"; + version = "2.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-l1huq9ofcUwmA1tbAe18Lj9Tmw3na9R5r1AD9fGbPrc="; + hash = "sha256-0aNkq4nacW2RZxup2J748ZZgaLug5HB5ekiWU4KcqvM="; }; propagatedBuildInputs = [ From da0b0bc6a5d699a8a9ffbf9e1b19e8642307062a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Sun, 9 Apr 2023 14:03:37 +0200 Subject: [PATCH 152/169] prusa-slicer: 2.5.1 -> 2.5.2 --- pkgs/applications/misc/prusa-slicer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 246e579975bb..c5750c6136bc 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -47,7 +47,7 @@ let in stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.5.1"; + version = "2.5.2"; nativeBuildInputs = [ cmake @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - sha256 = "sha256-ZeCofpBtsIBPRcjeJSEjOj+yNOOmYQA91/NLZwB2GUs="; + sha256 = "sha256-oQRBVAbA2wOYZkQiYIgbd3UcKAkXjnNXo6gB5QbPDAs="; rev = "version_${version}"; }; From 1380348ea89ce3e2be4a92efeba10d15980b4607 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Apr 2023 18:45:38 +0000 Subject: [PATCH 153/169] python310Packages.types-pytz: 2023.2.0.0 -> 2023.3.0.0 --- pkgs/development/python-modules/types-pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 8505a98a931b..dabefd41468e 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2023.2.0.0"; + version = "2023.3.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-7sfIBiIHds3nsvsgNxhT3dDRT6dUTKPGhiQzreN0ad8="; + hash = "sha256-7Nxw1UOq82FqfkhjFUOohPdCBfKEzv1mSd30TGqCCqw="; }; # Modules doesn't have tests From 0d8cf8b60a6bba3196c80911d9096df076b1facb Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 3 Mar 2023 12:07:23 +0000 Subject: [PATCH 154/169] mpvScripts.acompressor: init at 0.35.1 --- .../video/mpv/scripts/acompressor.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/video/mpv/scripts/acompressor.nix diff --git a/pkgs/applications/video/mpv/scripts/acompressor.nix b/pkgs/applications/video/mpv/scripts/acompressor.nix new file mode 100644 index 000000000000..d10ef5f9df75 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/acompressor.nix @@ -0,0 +1,27 @@ +{ stdenvNoCC +, mpv-unwrapped +, lib +}: + +stdenvNoCC.mkDerivation rec { + pname = "mpv-acompressor"; + version = mpv-unwrapped.version; + + src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/acompressor.lua"; + + dontBuild = true; + dontUnpack = true; + + installPhase = '' + install -Dm644 ${src} $out/share/mpv/scripts/acompressor.lua + ''; + + passthru.scriptName = "acompressor.lua"; + + meta = with lib; { + description = "Script to toggle and control ffmpeg's dynamic range compression filter."; + homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/acompressor.lua"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ nicoo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41dab119801b..4fda13715d14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31846,6 +31846,7 @@ with pkgs; mpvpaper = callPackage ../tools/wayland/mpvpaper { }; mpvScripts = recurseIntoAttrs { + acompressor = callPackage ../applications/video/mpv/scripts/acompressor.nix {}; autoload = callPackage ../applications/video/mpv/scripts/autoload.nix { }; convert = callPackage ../applications/video/mpv/scripts/convert.nix { }; inhibit-gnome = callPackage ../applications/video/mpv/scripts/inhibit-gnome.nix { }; From 04b1a3f847e46ea2bbb46cca56dde37a536272c7 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 9 Apr 2023 19:15:49 +0000 Subject: [PATCH 155/169] nixos/auto-cpufreq: Avoid touching /etc --- nixos/modules/services/hardware/auto-cpufreq.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/auto-cpufreq.nix b/nixos/modules/services/hardware/auto-cpufreq.nix index 5a8b7c8e43c5..df7c01ae54ef 100644 --- a/nixos/modules/services/hardware/auto-cpufreq.nix +++ b/nixos/modules/services/hardware/auto-cpufreq.nix @@ -27,15 +27,18 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ pkgs.auto-cpufreq ]; - environment.etc.${cfgFilename}.source = cfgFile; systemd = { packages = [ pkgs.auto-cpufreq ]; services.auto-cpufreq = { # Workaround for https://github.com/NixOS/nixpkgs/issues/81138 wantedBy = [ "multi-user.target" ]; - restartTriggers = [ cfgFile ]; path = with pkgs; [ bash coreutils ]; + + serviceConfig.ExecStart = [ + "" + "${lib.getExe pkgs.auto-cpufreq} --config ${cfgFile}" + ]; }; }; }; From 8425b6d377247004613c2761938ece59a545ee29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Apr 2023 19:25:26 +0000 Subject: [PATCH 156/169] python310Packages.types-protobuf: 4.22.0.0 -> 4.22.0.2 --- pkgs/development/python-modules/types-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 97538aa78cfa..324f0804c949 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "4.22.0.0"; + version = "4.22.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-vytBTYFdw4fAoEHZIH2wVMfNuUWRuyM9m3GoUkPgXvw="; + hash = "sha256-Axp3QDqJUrMYabn/OIPJohZJ3SJMo2c+5ChzhOkeor4="; }; propagatedBuildInputs = [ From 18111d5d7e16f154eda71f47c16415bc5093a698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 9 Apr 2023 20:34:45 +0200 Subject: [PATCH 157/169] neovide: 0.10.3 -> 0.10.4 --- .../editors/neovim/neovide/Cargo.lock | 986 ++++++++++++------ .../editors/neovim/neovide/default.nix | 5 +- 2 files changed, 642 insertions(+), 349 deletions(-) diff --git a/pkgs/applications/editors/neovim/neovide/Cargo.lock b/pkgs/applications/editors/neovim/neovide/Cargo.lock index f9526468afa2..febaea9c1637 100644 --- a/pkgs/applications/editors/neovim/neovide/Cargo.lock +++ b/pkgs/applications/editors/neovim/neovide/Cargo.lock @@ -4,9 +4,18 @@ version = 3 [[package]] name = "ab_glyph_rasterizer" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330223a1aecc308757b9926e9391c9b47f8ef2dbd8aea9df88312aea18c5e8d6" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] [[package]] name = "adler" @@ -20,16 +29,16 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -54,14 +63,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407" [[package]] -name = "async-trait" -version = "0.1.58" +name = "anstream" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" +checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-wincon", + "concolor-override", + "concolor-query", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" + +[[package]] +name = "anstyle-parse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-wincon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +dependencies = [ + "anstyle", + "windows-sys 0.45.0", +] + +[[package]] +name = "async-trait" +version = "0.1.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] @@ -70,7 +119,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -81,6 +130,21 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "base64" version = "0.13.1" @@ -124,15 +188,15 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "bytemuck" -version = "1.12.3" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" [[package]] name = "byteorder" @@ -152,9 +216,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "calloop" @@ -168,9 +232,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.74" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cexpr" @@ -202,17 +266,11 @@ dependencies = [ "libc", ] -[[package]] -name = "chunked_transfer" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" - [[package]] name = "clang-sys" -version = "1.4.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -236,30 +294,39 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.19" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e67816e006b17427c9b4386915109b494fec2d929c63e3bd3561234cbf1bf1e" +checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" dependencies = [ - "atty", - "bitflags", + "clap_builder", "clap_derive", - "clap_lex 0.3.0", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex 0.4.1", "once_cell", "strsim 0.10.0", - "termcolor", ] [[package]] name = "clap_derive" -version = "4.0.18" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a1b0f6422af32d5da0c58e2703320f379216ee70198241c84173a8c5ac28f3" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] @@ -273,12 +340,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "clipboard-win" @@ -308,9 +372,9 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" dependencies = [ "bitflags", "block", @@ -328,10 +392,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] -name = "copypasta" -version = "0.8.1" +name = "concolor-override" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7216b5c1e9ad3867252505995b02d01c6fa7e6db0d8abd42634352ef377777e" +checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" + +[[package]] +name = "concolor-query" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" +dependencies = [ + "windows-sys 0.45.0", +] + +[[package]] +name = "copypasta" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "133fc8675ee3a4ec9aa513584deda9aa0faeda3586b87f7f0f2ba082c66fb172" dependencies = [ "clipboard-win", "objc", @@ -357,7 +436,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "core-foundation-sys 0.8.3", + "core-foundation-sys 0.8.4", "libc", ] @@ -369,9 +448,9 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "core-graphics" @@ -448,9 +527,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -458,9 +537,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -469,22 +548,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.11" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if 1.0.0", "crossbeam-utils", - "memoffset", + "memoffset 0.8.0", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -492,9 +571,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if 1.0.0", ] @@ -535,7 +614,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.9.3", - "syn", + "syn 1.0.109", ] [[package]] @@ -546,7 +625,7 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -557,7 +636,7 @@ checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -624,15 +703,15 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "env_logger" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae4f45fe23a1cad99d61617b3c9dbc19c905f2671b25d1e2714b4b221dc3605" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", "humantime", @@ -642,34 +721,55 @@ dependencies = [ ] [[package]] -name = "euclid" -version = "0.22.7" +name = "errno" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b52c2ef4a78da0ba68fbe1fd920627411096d2ac478f7f4c9f3a54ba6705bade" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" dependencies = [ "num-traits", ] [[package]] name = "filetime" -version = "0.2.18" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", - "miniz_oxide 0.5.4", + "miniz_oxide", ] [[package]] @@ -739,9 +839,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -754,9 +854,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -764,15 +864,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -781,38 +881,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures 0.1.31", "futures-channel", @@ -828,6 +928,16 @@ dependencies = [ "tokio-io", ] +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "getrandom" version = "0.1.16" @@ -841,15 +951,21 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if 1.0.0", "libc", "wasi 0.11.0+wasi-snapshot-preview1", ] +[[package]] +name = "gimli" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" + [[package]] name = "gl" version = "0.14.0" @@ -872,9 +988,9 @@ dependencies = [ [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "glutin" @@ -953,9 +1069,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -966,6 +1082,21 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "humantime" version = "2.1.0" @@ -990,9 +1121,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.4" +version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c" +checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" dependencies = [ "bytemuck", "byteorder", @@ -1004,9 +1135,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", @@ -1021,6 +1152,17 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "io-lifetimes" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "iovec" version = "0.1.4" @@ -1030,6 +1172,18 @@ dependencies = [ "libc", ] +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -1041,9 +1195,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jni-sys" @@ -1053,9 +1207,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -1086,9 +1240,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.137" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "libloading" @@ -1110,6 +1264,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "linux-raw-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" + [[package]] name = "lock_api" version = "0.4.9" @@ -1173,9 +1333,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.5.7" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" dependencies = [ "libc", ] @@ -1189,21 +1349,21 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + [[package]] name = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.6.2" @@ -1228,14 +1388,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -1261,9 +1421,9 @@ dependencies = [ [[package]] name = "mockall" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326" +checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" dependencies = [ "cfg-if 1.0.0", "downcast", @@ -1276,14 +1436,14 @@ dependencies = [ [[package]] name = "mockall_derive" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0" +checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" dependencies = [ "cfg-if 1.0.0", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1328,7 +1488,7 @@ dependencies = [ "proc-macro-crate 0.1.5", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1339,11 +1499,12 @@ checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" [[package]] name = "neovide" -version = "0.10.3" +version = "0.10.4" dependencies = [ "async-trait", + "backtrace", "cfg-if 1.0.0", - "clap 4.0.19", + "clap 4.2.1", "cocoa", "copypasta", "csscolorparser", @@ -1351,10 +1512,11 @@ dependencies = [ "dirs", "euclid", "flexi_logger", - "futures 0.3.25", + "futures 0.3.28", "gl", "glutin", "image", + "itertools", "lazy_static", "log", "lru", @@ -1371,6 +1533,7 @@ dependencies = [ "shlex", "skia-safe", "swash", + "time", "tokio", "tokio-util", "unicode-segmentation", @@ -1386,7 +1549,7 @@ name = "neovide-derive" version = "0.1.0" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1415,21 +1578,21 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags", "cfg-if 1.0.0", "libc", - "memoffset", + "memoffset 0.6.5", ] [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", @@ -1482,33 +1645,33 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] [[package]] name = "num_enum" -version = "0.5.7" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.7" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "proc-macro-crate 1.2.1", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1523,10 +1686,11 @@ dependencies = [ [[package]] name = "nvim-rs" version = "0.5.0" -source = "git+https://github.com/KillTheMule/nvim-rs?branch=master#d701c2790dcb2579f8f4d7003ba30e2100a7d25b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e98dcbd3b0ece3cf2b76ebc1e33e6511777ea7322884f4b7150cbc253afa37e" dependencies = [ "async-trait", - "futures 0.3.25", + "futures 0.3.28", "log", "parity-tokio-ipc", "rmp", @@ -1565,16 +1729,25 @@ dependencies = [ ] [[package]] -name = "once_cell" -version = "1.16.0" +name = "object" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "os_str_bytes" -version = "6.3.1" +version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9" +checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" [[package]] name = "osmesa-sys" @@ -1600,7 +1773,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6" dependencies = [ - "futures 0.3.25", + "futures 0.3.28", "libc", "log", "rand 0.7.3", @@ -1616,7 +1789,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] @@ -1626,14 +1799,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.4", + "parking_lot_core 0.9.7", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if 1.0.0", "instant", @@ -1645,22 +1818,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.4" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] name = "paste" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "peeking_take_while" @@ -1704,7 +1877,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1733,7 +1906,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1763,7 +1936,7 @@ dependencies = [ "bitflags", "crc32fast", "flate2", - "miniz_oxide 0.6.2", + "miniz_oxide", ] [[package]] @@ -1774,9 +1947,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "2.1.2" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab68289ded120dcbf9d571afcf70163233229052aec9b08ab09532f698d0e1e6" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", @@ -1788,15 +1961,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e7125585d872860e9955ca571650b27a4979c5823084168c5ed5bbfb016b56" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "predicates-tree" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad3f7fa8d61e139cbc7c3edfebf3b6678883a53f5ffac65d1259329a93ee43a5" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" dependencies = [ "predicates-core", "termtree", @@ -1813,62 +1986,28 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.2.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "thiserror", - "toml", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", + "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] -[[package]] -name = "quick-xml" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b" -dependencies = [ - "memchr", -] - [[package]] name = "quote" -version = "1.0.21" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -1932,7 +2071,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", ] [[package]] @@ -1978,16 +2117,16 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", "redox_syscall", "thiserror", ] [[package]] name = "regex" -version = "1.7.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -1996,9 +2135,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "ring" @@ -2036,6 +2175,12 @@ dependencies = [ "rmp", ] +[[package]] +name = "rustc-demangle" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" + [[package]] name = "rustc-hash" version = "1.1.0" @@ -2043,10 +2188,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustls" -version = "0.20.7" +name = "rustix" +version = "0.37.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", @@ -2066,15 +2225,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "same-file" @@ -2109,29 +2268,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.147" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" dependencies = [ "itoa", "ryu", @@ -2156,9 +2315,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -2200,9 +2359,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -2242,8 +2401,8 @@ dependencies = [ "dlib 0.5.0", "lazy_static", "log", - "memmap2 0.5.7", - "nix 0.24.2", + "memmap2 0.5.10", + "nix 0.24.3", "pkg-config", "wayland-client 0.29.5", "wayland-cursor 0.29.5", @@ -2262,9 +2421,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -2290,9 +2449,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "swash" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1bdb2004b76b5f5f3afe722d70b1aea160d2362cb7e40716a7106197ee7f82d" +checksum = "8bb18e5888a9b5f0a89ea3ebdf6883dc479347ca9183b6c51a8f9cf2041f23a0" dependencies = [ "yazi", "zeno", @@ -2300,9 +2459,20 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.103" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" dependencies = [ "proc-macro2", "quote", @@ -2322,18 +2492,18 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "termtree" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "textwrap" @@ -2343,22 +2513,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] @@ -2390,28 +2560,27 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.21.2" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" dependencies = [ "autocfg", - "bytes 1.2.1", + "bytes 1.4.0", "libc", - "memchr", - "mio 0.8.5", + "mio 0.8.6", "num_cpus", "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "winapi", + "windows-sys 0.45.0", ] [[package]] @@ -2427,22 +2596,22 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.8.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ - "bytes 1.2.1", + "bytes 1.4.0", "futures-core", "futures-io", "futures-sink", @@ -2452,13 +2621,30 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" + +[[package]] +name = "toml_edit" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + [[package]] name = "ttf-parser" version = "0.15.2" @@ -2467,15 +2653,15 @@ checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" @@ -2488,9 +2674,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "untrusted" @@ -2500,12 +2686,11 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "ureq" -version = "2.5.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f" +checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d" dependencies = [ "base64", - "chunked_transfer", "flate2", "log", "once_cell", @@ -2526,6 +2711,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "version_check" version = "0.9.4" @@ -2534,12 +2725,11 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -2557,9 +2747,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2567,24 +2757,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2592,22 +2782,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "wayland-client" @@ -2634,7 +2824,7 @@ dependencies = [ "bitflags", "downcast-rs", "libc", - "nix 0.24.2", + "nix 0.24.3", "scoped-tls", "wayland-commons 0.29.5", "wayland-scanner 0.29.5", @@ -2659,7 +2849,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" dependencies = [ - "nix 0.24.2", + "nix 0.24.3", "once_cell", "smallvec", "wayland-sys 0.29.5", @@ -2682,7 +2872,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" dependencies = [ - "nix 0.24.2", + "nix 0.24.3", "wayland-client 0.29.5", "xcursor", ] @@ -2767,9 +2957,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -2787,18 +2977,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki", ] [[package]] name = "which" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", "libc", @@ -2830,6 +3020,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "winapi-wsapoll" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +dependencies = [ + "winapi", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -2838,60 +3037,135 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winit" @@ -2929,6 +3203,15 @@ dependencies = [ "xkbcommon-dl", ] +[[package]] +name = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +dependencies = [ + "memchr", +] + [[package]] name = "winres" version = "0.1.12" @@ -2940,24 +3223,46 @@ dependencies = [ [[package]] name = "x11-clipboard" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a7468a5768fea473e6c8c0d4b60d6d7001a64acceaac267207ca0281e1337e8" +checksum = "980b9aa9226c3b7de8e2adb11bf20124327c054e0e5812d2aac0b5b5a87e7464" dependencies = [ - "xcb", + "x11rb", ] [[package]] name = "x11-dl" -version = "2.20.0" +version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c83627bc137605acc00bb399c7b908ef460b621fc37c953db2b09f88c449ea6" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" dependencies = [ - "lazy_static", "libc", + "once_cell", "pkg-config", ] +[[package]] +name = "x11rb" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" +dependencies = [ + "gethostname", + "nix 0.24.3", + "winapi", + "winapi-wsapoll", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" +dependencies = [ + "nix 0.24.3", +] + [[package]] name = "xattr" version = "0.2.3" @@ -2967,17 +3272,6 @@ dependencies = [ "libc", ] -[[package]] -name = "xcb" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0faeb4d7e2d54fff4a0584f61297e86b106914af2029778de7b427f72564d6c5" -dependencies = [ - "bitflags", - "libc", - "quick-xml", -] - [[package]] name = "xcursor" version = "0.3.4" diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index e71d7a29407c..d14181d26d14 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -25,20 +25,19 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pname = "neovide"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "neovide"; repo = "neovide"; rev = version; - sha256 = "sha256-CcBiCcfOJzuq0DnokTUHpMdo7Ry29ugQ+N7Hk0R+cQE="; + sha256 = "sha256-0vIq8vJPvcmA7hRyGY4qQRxwmgQAKHVU+452iMohGCA="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "glutin-0.26.0" = "sha256-Ie4Jb3wCMZSmF1MUzkLG2TqsLrXXzzi6ATjzCjevZBc="; - "nvim-rs-0.5.0" = "sha256-3U0/OSDkJYCihFN7UbxnoIgsHKUQB4FAdYTqBZPT2us="; "winit-0.24.0" = "sha256-p/eAaDVmTHzfZ+0DiBA/9v06Z5o1dXVNoCgWRqC1ed0="; "xkbcommon-dl-0.1.0" = "sha256-ojokJF7ivN8JpXo+JAfX3kUOeXneNek7pzIy8D1n4oU="; }; From 48669e91f82f94b0c4f092951f9c355f0283903f Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Thu, 6 Apr 2023 10:55:34 +0200 Subject: [PATCH 158/169] freecad: set QT_QPA_PLATFORM=xcb Makes freecad work correctly on wayland --- pkgs/applications/graphics/freecad/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 7ed9cc865d23..ce15b42576b3 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -134,6 +134,7 @@ mkDerivation rec { qtWrapperArgs = [ "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" "--prefix PATH : ${libredwg}/bin" + "--set QT_QPA_PLATFORM xcb" ]; postFixup = '' From 40ccdecb472bd1fbed47cdb9658b8d967d689e3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Apr 2023 20:34:06 +0000 Subject: [PATCH 159/169] stripe-cli: 1.13.12 -> 1.14.0 --- pkgs/tools/admin/stripe-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 6b8cfa4ca115..7ec22ff3ff7f 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.13.12"; + version = "1.14.0"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - hash = "sha256-Zk7Mt2ffhuVT3RB+ZeBRIBybIfEO9AQ4LNVmWU2FutU="; + hash = "sha256-c7zfovUZMerUMbjrDPTTMuhzVKSA7VT7VYWy6MhSf88="; }; vendorHash = "sha256-rjYV69BWkqIkgyeauAo4KEfbB7cxnwn3VSjLrMrCu1c="; @@ -29,7 +29,7 @@ buildGoModule rec { rm pkg/cmd/resources_test.go rm pkg/cmd/root_test.go - # TODO: no clue why it's broken (1.13.12), remove for now. + # TODO: no clue why it's broken (1.14.0), remove for now. rm pkg/login/client_login_test.go rm pkg/git/editor_test.go rm pkg/rpcservice/sample_create_test.go From c97c59b8778e4128586cfa80422a8df68bc0a0b8 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 9 Apr 2023 19:04:39 +0200 Subject: [PATCH 160/169] mlterm: indent --- .../terminal-emulators/mlterm/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index d27e5bec1ac8..056ce58e9933 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -81,15 +81,15 @@ stdenv.mkDerivation rec { "--enable-ind" #indic scripts "--enable-fribidi" #bidi scripts "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc" - #mlterm-menu and mlconfig depend on enabling gnome.at-spi2-core - #and configuring ~/.mlterm/key correctly. - ] ++ lib.optionals (!stdenv.isDarwin) [ - "--with-x=yes" - "--with-gui=xlib,fb" + #mlterm-menu and mlconfig depend on enabling gnome.at-spi2-core + #and configuring ~/.mlterm/key correctly. + ] ++ lib.optionals (!stdenv.isDarwin) [ + "--with-x=yes" + "--with-gui=xlib,fb" "--enable-m17nlib" #character encodings - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "--with-gui=quartz" - ] ++ lib.optionals (libssh2 == null) [ " --disable-ssh2" ]; + ] ++ lib.optionals (libssh2 == null) [ " --disable-ssh2" ]; postInstall = '' install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" From d0538f6287e5f5225170b5b2be7a73a9357c4590 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 9 Apr 2023 19:04:54 +0200 Subject: [PATCH 161/169] mlterm: enableParallelBuilding --- pkgs/applications/terminal-emulators/mlterm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 056ce58e9933..2ac6f45a598d 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -91,6 +91,8 @@ stdenv.mkDerivation rec { "--with-gui=quartz" ] ++ lib.optionals (libssh2 == null) [ " --disable-ssh2" ]; + enableParallelBuilding = true; + postInstall = '' install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" install -D contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png" From 89ec2cbc86a5ce991118afa4d675b514cde8263d Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 9 Apr 2023 19:05:21 +0200 Subject: [PATCH 162/169] mlterm: 3.9.2 -> 3.9.3 --- pkgs/applications/terminal-emulators/mlterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 2ac6f45a598d..c24830cf2ddb 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "mlterm"; - version = "3.9.2"; + version = "3.9.3"; src = fetchFromGitHub { owner = "arakiken"; repo = pname; rev = version; - sha256 = "sha256-DvGR3rDegInpnLp3H+rXNXktCGhpjsBBPTRMwodeTro="; + sha256 = "sha256-gfs5cdwUUwSBWwJJSaxrQGWJvLkI27RMlk5QvDALEDg="; }; nativeBuildInputs = [ pkg-config autoconf wrapGAppsHook ]; From c320d10418f66d6a694912308d7ef28924abf8d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Apr 2023 20:46:47 +0000 Subject: [PATCH 163/169] buf: 1.16.0 -> 1.17.0 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index c1f80b01f54f..bb305154dc4d 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-VZgrt9Fy1PyMoItuCx9R3DxJWYZu7gmL+KnBfOrm0y4="; + hash = "sha256-GvWbezfRPdZqd53GcBNHca9yYt0a5WLBXNgahKGQaUI="; }; - vendorHash = "sha256-ePM7TITBiwTqJEgew+1FTyuyywmAu8ZSPlhCghH3k5k="; + vendorHash = "sha256-ajSWq58KUX5Qi36jlV3ftIrK7XWjLAusf4BPkQy6EPU="; patches = [ # Skip a test that requires networking to be available to work. From bebe1fe60bb734e217565ea853122224d9d1e86e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Apr 2023 20:52:08 +0000 Subject: [PATCH 164/169] comma: 1.5.0 -> 1.6.0 --- pkgs/tools/package-management/comma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/tools/package-management/comma/default.nix index 3007a02c3d19..7b0416193891 100644 --- a/pkgs/tools/package-management/comma/default.nix +++ b/pkgs/tools/package-management/comma/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "comma"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "comma"; rev = "v${version}"; - hash = "sha256-OonKO7D6xuNf9S6SvxWYzZXNOfoUw5ZEymfC5UmZT7Y="; + hash = "sha256-5HNH/Lqj8OU/piH3tvPRkINXHHkt6bRp0QYYR4xOybE="; }; - cargoHash = "sha256-q6MbaKrGkwvKWSfL7bQjf9+RdcgKpKj3iXJtSz3FnMc="; + cargoHash = "sha256-4Epy5ZPyitRVTHEFVlRo66GvxJVBddlOII/7yqjuK9k="; nativeBuildInputs = [ makeBinaryWrapper ]; From 566b3e38ab8cf9eea857e72fb78f4abb89fb2b28 Mon Sep 17 00:00:00 2001 From: Dominik Honnef Date: Wed, 22 Feb 2023 13:35:58 +0100 Subject: [PATCH 165/169] python3Packages.notifications-android-tv: init at 1.0.0 Needed by the "nfandroidtv" integration of Home Assistant. --- .../notifications-android-tv/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/notifications-android-tv/default.nix diff --git a/pkgs/development/python-modules/notifications-android-tv/default.nix b/pkgs/development/python-modules/notifications-android-tv/default.nix new file mode 100644 index 000000000000..00e43cfe1879 --- /dev/null +++ b/pkgs/development/python-modules/notifications-android-tv/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpx +, poetry-core +, pytest-asyncio +, pytest-httpx +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "notifications-android-tv"; + version = "1.0.0"; + format = "pyproject"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "engrbm87"; + repo = "notifications_android_tv"; + rev = version; + hash = "sha256-Xr+d2uYzgFp/Fb00ymov02+GYnwjGc3FbJ/rIvQXzCE="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + httpx + ]; + + pythonImportsCheck = [ "notifications_android_tv" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ + pytest-asyncio + pytest-httpx + ]; + + meta = with lib; { + description = "Python API for sending notifications to Android/Fire TVs"; + homepage = "https://github.com/engrbm87/notifications_android_tv"; + changelog = "https://github.com/engrbm87/notifications_android_tv/blob/${version}/CHANGES.rst"; + license = licenses.mit; + maintainers = with maintainers; [ dominikh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c81f05e35d94..e856ddb72bcd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6621,6 +6621,8 @@ self: super: with self; { notedown = callPackage ../development/python-modules/notedown { }; + notifications-android-tv = callPackage ../development/python-modules/notifications-android-tv { }; + notifications-python-client = callPackage ../development/python-modules/notifications-python-client { }; notify-events = callPackage ../development/python-modules/notify-events { }; From 4580a38fec9851800b283780146e4379487ba8c5 Mon Sep 17 00:00:00 2001 From: Dominik Honnef Date: Wed, 22 Feb 2023 19:25:59 +0100 Subject: [PATCH 166/169] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b0d56acfc1fc..43fa7e47d23d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2483,7 +2483,8 @@ nextdns ]; "nfandroidtv" = ps: with ps; [ - ]; # missing inputs: notifications-android-tv + notifications-android-tv + ]; "nibe_heatpump" = ps: with ps; [ nibe ]; @@ -4761,6 +4762,7 @@ "nextbus" "nextcloud" "nextdns" + "nfandroidtv" "nibe_heatpump" "nightscout" "nina" From 80e27c13d9ca582884ece69fdeafe8bbaf1df2df Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Apr 2023 23:20:37 +0200 Subject: [PATCH 167/169] home-assistant: Pin notifications-android-tv at 0.1.5 --- pkgs/servers/home-assistant/default.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 359d7c1d1a47..568c029543bb 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -114,6 +114,28 @@ let doCheck = false; }); + notifications-android-tv = super.notifications-android-tv.overridePythonAttrs (oldAttrs: rec { + version = "0.1.5"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "engrbm87"; + repo = "notifications_android_tv"; + rev = "refs/tags/${version}"; + hash = "sha256-adkcUuPl0jdJjkBINCTW4Kmc16C/HzL+jaRZB/Qr09A="; + }; + + nativeBuildInputs = with super; [ + setuptools + ]; + + propagatedBuildInputs = with super; [ + requests + ]; + + doCheck = false; # no tests + }); + # Pinned due to API changes in 1.3.0 ovoenergy = super.ovoenergy.overridePythonAttrs (oldAttrs: rec { version = "1.2.0"; From 00c7af0dd611eb7592c8643f5d68886a89216eef Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 8 Apr 2023 10:22:03 -0300 Subject: [PATCH 168/169] nas: 1.9.4 -> 1.9.5 --- pkgs/servers/nas/default.nix | 53 ++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/nas/default.nix b/pkgs/servers/nas/default.nix index c5dba62c6e7c..e9355f489027 100644 --- a/pkgs/servers/nas/default.nix +++ b/pkgs/servers/nas/default.nix @@ -1,18 +1,43 @@ -{ lib, stdenv, fetchurl, imake, bison, flex, gccmakedep -, xorgproto, libXau, libXt, libXext, libXaw, libXpm, xorgcffiles }: +{ lib +, stdenv +, fetchurl +, bison +, flex +, gccmakedep +, imake +, libXau +, libXaw +, libXext +, libXpm +, libXt +, xorgcffiles +, xorgproto +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "nas"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.src.tar.gz"; - sha256 = "17dk0ckm6mp1ajc0cd6bwyi638ynw2f6bhbn7gynrs0wfmiyldng"; + url = "mirror://sourceforge/nas/nas-${self.version}.tar.gz"; + hash = "sha256-t4hK+zj+7AOhlr07fpxHuAPIMOzRDXRV6cl+Eiw3lEw="; }; - nativeBuildInputs = [ imake bison flex gccmakedep ]; + nativeBuildInputs = [ + bison + flex + gccmakedep + imake + ]; - buildInputs = [ xorgproto libXau libXt libXext libXaw libXpm ]; + buildInputs = [ + libXau + libXaw + libXext + libXpm + libXt + xorgproto + ]; buildFlags = [ "WORLDOPTS=" "World" ]; @@ -20,14 +45,14 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/${xorgcffiles}/* $out - rm -r $out/nix + rm -fr $out/nix ''; - meta = with lib; { - description = "A network transparent, client/server audio transport system"; + meta = { homepage = "http://radscan.com/nas.html"; - license = licenses.mit; + description = "A network transparent, client/server audio transport system"; + license = lib.licenses.mit; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) From 619ca2064f709582ef4710be2c18433241adfdd0 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sun, 9 Apr 2023 22:57:58 +0200 Subject: [PATCH 169/169] luaPackages.luv: 1.43.0-0 -> 1.44.2-1 as requested by neovim --- maintainers/scripts/luarocks-packages.csv | 2 +- pkgs/development/lua-modules/generated-packages.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 60389f9abb2d..514a96700956 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -82,7 +82,7 @@ luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn luuid,,,,,, -luv,,,,1.43.0-0,, +luv,,,,1.44.2-1,, lush.nvim,https://github.com/rktjmp/lush.nvim,,,,,teto lyaml,,,,,,lblasc markdown,,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 542c14d751d6..f42987787492 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2346,17 +2346,17 @@ buildLuarocksPackage { }; }) {}; -luv = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +luv = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "luv"; - version = "1.43.0-0"; + version = "1.44.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luv-1.43.0-0.rockspec"; - sha256 = "0z5a7yp20xbb3f9w73skm9fj89gxxqv72nrxjq3kycsc6c2v3m8f"; + url = "mirror://luarocks/luv-1.44.2-1.rockspec"; + sha256 = "07jwi50i16rv7sj914k1q3l9dy9wldbw2skmsdrzlkc57mqvg348"; }).outPath; src = fetchurl { - url = "https://github.com/luvit/luv/releases/download/1.43.0-0/luv-1.43.0-0.tar.gz"; - sha256 = "1qlx1r79sfn8r20yx19bhdr0v58ykpwgwzy5vma9p2ngrlynyyjn"; + url = "https://github.com/luvit/luv/releases/download/1.44.2-1/luv-1.44.2-1.tar.gz"; + sha256 = "0c2wkszxw6gwa4l6g1d2zzh660j13lif6c7a910vq7zn8jycgd9y"; }; disabled = (luaOlder "5.1");