From 52c41d40077e0189a253c079fbf572fa98e0dc94 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Mon, 26 Dec 2022 15:59:48 -0800 Subject: [PATCH 01/81] linuxConsoleTools: 1.6.1 -> 1.8.1 --- pkgs/os-specific/linux/consoletools/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix index 8def013b956f..61ddd5203cdc 100644 --- a/pkgs/os-specific/linux/consoletools/default.nix +++ b/pkgs/os-specific/linux/consoletools/default.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchurl, SDL }: +{ lib, stdenv, fetchurl, pkg-config, SDL, SDL2 }: stdenv.mkDerivation rec { pname = "linuxconsoletools"; - version = "1.6.1"; + version = "1.8.1"; src = fetchurl { url = "mirror://sourceforge/linuxconsole/${pname}-${version}.tar.bz2"; - sha256 = "0d2r3j916fl2y7pk1y82b9fvbr10dgs1gw7rqwzfpispdidb1mp9"; + sha256 = "sha256-TaKXRceCt9sY9fN8Sed78WMSHdN2Hi/HY2+gy/NcJFY="; }; - buildInputs = [ SDL ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ SDL SDL2 ]; makeFlags = [ "DESTDIR=$(out)"]; From 77219b639f32f9d63847d01cf4a5366dae135d96 Mon Sep 17 00:00:00 2001 From: Jeremy Parker Date: Sun, 9 Jul 2023 14:15:46 +1000 Subject: [PATCH 02/81] maintainers: add nrhtr --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b0fc2f21ef20..1a91fd88e0bd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12064,6 +12064,12 @@ githubId = 15707703; name = "Helmi Nour"; }; + nrhtr = { + email = "jeremy@jenga.xyz"; + github = "nrhtr"; + githubId = 74261; + name = "Jeremy Parker"; + }; nshalman = { email = "nahamu@gmail.com"; github = "nshalman"; From 361004bca648e69c8f75c9b38027a0a8b55a7c9c Mon Sep 17 00:00:00 2001 From: Jeremy Parker Date: Sun, 9 Jul 2023 14:04:11 +1000 Subject: [PATCH 03/81] grizzly: init at 0.2.0 --- pkgs/tools/misc/grizzly/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/grizzly/default.nix diff --git a/pkgs/tools/misc/grizzly/default.nix b/pkgs/tools/misc/grizzly/default.nix new file mode 100644 index 000000000000..a9b7bde2e7bd --- /dev/null +++ b/pkgs/tools/misc/grizzly/default.nix @@ -0,0 +1,28 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "grizzly"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "grafana"; + repo = pname; + rev = "v${version}"; + hash = "sha256-6z/6QZlCm4mRMKAVzLnOokv8ib7Y/7a17ojjMfeoJ4w="; + }; + + vendorHash = "sha256-DDYhdRPcD5hfSW9nRmCWpsrVmIEU1sBoVvFz5Begx8w="; + + subPackages = [ "cmd/grr" ]; + + meta = with lib; { + description = "A utility for managing Jsonnet dashboards against the Grafana API"; + homepage = "https://grafana.github.io/grizzly/"; + license = licenses.asl20; + maintainers = with lib.maintainers; [ nrhtr ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dcf46a01bb4..b571eb8ea530 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1675,6 +1675,8 @@ with pkgs; gp-saml-gui = python3Packages.callPackage ../tools/networking/gp-saml-gui { }; + grizzly = callPackage ../tools/misc/grizzly { }; + guestfs-tools = callPackage ../tools/virtualization/guestfs-tools { }; fabs = callPackage ../tools/backup/fabs { }; From cff80e2b846e058c2ea72ff1df921d5ddb3f6307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 6 Aug 2023 12:48:47 -0700 Subject: [PATCH 04/81] python310Packages.pyfuse3: 3.2.3 -> 3.3.0 Diff: https://github.com/libfuse/pyfuse3/compare/refs/tags/3.2.3...3.3.0 Changelog: https://github.com/libfuse/pyfuse3/blob/3.3.0/Changes.rst --- pkgs/development/python-modules/pyfuse3/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyfuse3/default.nix b/pkgs/development/python-modules/pyfuse3/default.nix index 45dbd1a43ae2..0f7632d64937 100644 --- a/pkgs/development/python-modules/pyfuse3/default.nix +++ b/pkgs/development/python-modules/pyfuse3/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, cython +, cython_3 , pkg-config , fuse3 , trio @@ -14,9 +14,9 @@ buildPythonPackage rec { pname = "pyfuse3"; - version = "3.2.3"; + version = "3.3.0"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.8"; format = "setuptools"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "libfuse"; repo = "pyfuse3"; rev = "refs/tags/${version}"; - hash = "sha256-2YrVapCojcFRaljqNeWPMWz3hEgSutKPy2u8FXp0fME="; + hash = "sha256-GLGuTFdTA16XnXKSBD7ET963a8xH9EG/JfPNu6/3DOg="; }; postPatch = '' @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - cython + cython_3 pkg-config ]; From 0dc3b107df044ee11e15b3b51ccf4f1ad439bfaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 7 Aug 2023 10:34:16 -0700 Subject: [PATCH 05/81] python310Packages.pyfuse3: use pyproject format --- pkgs/development/python-modules/pyfuse3/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyfuse3/default.nix b/pkgs/development/python-modules/pyfuse3/default.nix index 0f7632d64937..7df84ea78abd 100644 --- a/pkgs/development/python-modules/pyfuse3/default.nix +++ b/pkgs/development/python-modules/pyfuse3/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , cython_3 , pkg-config +, setuptools , fuse3 , trio , python @@ -18,7 +19,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - format = "setuptools"; + format = "pyproject"; src = fetchFromGitHub { owner = "libfuse"; @@ -35,6 +36,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython_3 pkg-config + setuptools ]; buildInputs = [ fuse3 ]; From bb842a0613dff266d49d27f0441e20c8a41e2dd6 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 7 Aug 2023 13:20:33 -0700 Subject: [PATCH 06/81] python3.pkgs.cirq-core: disable test that fails after sympy update to v1.12.0 Co-authored-by: Chris Pattison --- pkgs/development/python-modules/cirq-core/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index 39e3cf9d47be..ce188ce6811b 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -104,6 +104,8 @@ buildPythonPackage rec { "test_benchmark_2q_xeb_fidelities" # https://github.com/quantumlib/Cirq/pull/5991 "test_json_and_repr_data" + # Tests for some changed error handling behavior in SymPy 1.12 + "test_custom_value_not_implemented" ]; meta = with lib; { From 912cc6b0223ab28c0857cae98c0136631db6223f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 7 Aug 2023 13:43:52 -0700 Subject: [PATCH 07/81] python310Packages.llfuse: 1.4.4 -> 1.5.0 Diff: https://github.com/python-llfuse/python-llfuse/compare/refs/tags/release-1.4.4...1.5.0 Changelog: https://github.com/python-llfuse/python-llfuse/raw/release-1.5.0/Changes.rst --- pkgs/development/python-modules/llfuse/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 429720135737..fd4504507680 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, cython +, cython_3 , fuse , pkg-config , pytestCheckHook @@ -14,20 +14,20 @@ buildPythonPackage rec { pname = "llfuse"; - version = "1.4.4"; + version = "1.5.0"; format = "pyproject"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-llfuse"; repo = "python-llfuse"; rev = "refs/tags/release-${version}"; - hash = "sha256-qsnmhnZsK0j9dPhXT9mymQTzVHmmGnB5vgONatxDLIo="; + hash = "sha256-6/iW5eHmX6ODVPLFkOo3bN9yW8ixqy2MHwQ2r9FA0iI="; }; - nativeBuildInputs = [ cython pkg-config setuptools ]; + nativeBuildInputs = [ cython_3 pkg-config setuptools ]; buildInputs = [ fuse ]; From 1af5e08cd9870bc3355e80e99f0499bef05ab1ef Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Thu, 15 Jun 2023 16:58:11 +0200 Subject: [PATCH 08/81] python3Packages.pygrok: enable on darwin --- pkgs/development/python-modules/pygrok/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pygrok/default.nix b/pkgs/development/python-modules/pygrok/default.nix index f209463f9991..7414b0df0df2 100644 --- a/pkgs/development/python-modules/pygrok/default.nix +++ b/pkgs/development/python-modules/pygrok/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "A python implementation of jordansissel's grok regular expression library"; homepage = "https://github.com/garyelephant/pygrok"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } From e06271773036c6fdc9df132fc2336dfcc2e8f456 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Aug 2023 19:07:26 +0200 Subject: [PATCH 09/81] python311Packages.google-api-core: 2.11.0 -> 2.11.1 Changelog: https://github.com/googleapis/python-api-core/blob/v2.11.1/CHANGELOG.md --- pkgs/development/python-modules/google-api-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index c4cf9b2e0767..9df9562c3d15 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.11.0"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-S5u11aOAoL76BXOzAmUbipqJJiwXMON79CPOxRGATCI="; + hash = "sha256-JdKeBaAFjtXxnGHAp4sbU63qTZNktGTQFPvalB9tHJo="; }; propagatedBuildInputs = [ From 920b51d744d76ad6795092d6ca3a1ab85c1198af Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 8 Aug 2023 17:40:15 -0400 Subject: [PATCH 10/81] zls: 0.10.0 -> 0.11.0 Diff: https://github.com/zigtools/zls/compare/0.10.0...0.11.0 Changelog: https://github.com/zigtools/zls/releases/tag/0.11.0 --- .../tools/language-servers/zls/default.nix | 11 +++++--- .../tools/language-servers/zls/deps.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/tools/language-servers/zls/deps.nix diff --git a/pkgs/development/tools/language-servers/zls/default.nix b/pkgs/development/tools/language-servers/zls/default.nix index 65f39381c8ca..1bf1f3dbb7b2 100644 --- a/pkgs/development/tools/language-servers/zls/default.nix +++ b/pkgs/development/tools/language-servers/zls/default.nix @@ -2,32 +2,35 @@ , stdenv , fetchFromGitHub , zigHook +, callPackage }: stdenv.mkDerivation (finalAttrs: { pname = "zls"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "zigtools"; repo = "zls"; rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-M0GG4KIMcHN+bEprUv6ISZkWNvWN12S9vqSKP+DRU9M="; + hash = "sha256-WrbjJyc4pj7R4qExdzd0DOQ9Tz3TFensAfHdecBA8UI="; }; nativeBuildInputs = [ zigHook ]; - dontConfigure = true; + postPatch = '' + ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p + ''; meta = { description = "Zig LSP implementation + Zig Language Server"; changelog = "https://github.com/zigtools/zls/releases/tag/${finalAttrs.version}"; homepage = "https://github.com/zigtools/zls"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fortuneteller2k ]; + maintainers = with lib.maintainers; [ figsoda fortuneteller2k ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/tools/language-servers/zls/deps.nix b/pkgs/development/tools/language-servers/zls/deps.nix new file mode 100644 index 000000000000..5c1b2ce89d3c --- /dev/null +++ b/pkgs/development/tools/language-servers/zls/deps.nix @@ -0,0 +1,27 @@ +# generated by zon2nix (https://github.com/figsoda/zon2nix) + +{ linkFarm, fetchzip }: + +linkFarm "zig-packages" [ + { + name = "1220363c7e27b2d3f39de6ff6e90f9537a0634199860fea237a55ddb1e1717f5d6a5"; + path = fetchzip { + url = "https://gist.github.com/antlilja/8372900fcc09e38d7b0b6bbaddad3904/archive/6c3321e0969ff2463f8335da5601986cf2108690.tar.gz"; + hash = "sha256-m/kr4kmkG2rLkAj5YwvM0HmXTd+chAiQHzYK6ozpWlw="; + }; + } + { + name = "122048992ca58a78318b6eba4f65c692564be5af3b30fbef50cd4abeda981b2e7fa5"; + path = fetchzip { + url = "https://github.com/ziglibs/known-folders/archive/fa75e1bc672952efa0cf06160bbd942b47f6d59b.tar.gz"; + hash = "sha256-U/h4bVarq8CFKbFyNXKl3vBRPubYooLxA1xUz3qMGPE="; + }; + } + { + name = "122089a8247a693cad53beb161bde6c30f71376cd4298798d45b32740c3581405864"; + path = fetchzip { + url = "https://github.com/ziglibs/diffz/archive/90353d401c59e2ca5ed0abe5444c29ad3d7489aa.tar.gz"; + hash = "sha256-3CdYo6WevT0alRwKmbABahjhFKz7V9rdkDUZ43VtDeU="; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 768bf1dc0f00..a20122b1595a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18317,7 +18317,7 @@ with pkgs; zls = callPackage ../development/tools/language-servers/zls { zigHook = zigHook.override { - zig = buildPackages.zig_0_10; + zig = buildPackages.zig_0_11; }; }; From 060fe1a29329abc8fe0e2b5e4bcb0d09deeec78b Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 8 Aug 2023 19:38:58 -0700 Subject: [PATCH 11/81] python3.pkgs.xknxproject: fix up build dependencies --- .../python-modules/xknxproject/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/xknxproject/default.nix b/pkgs/development/python-modules/xknxproject/default.nix index 67a606690269..7de6ca3bc803 100644 --- a/pkgs/development/python-modules/xknxproject/default.nix +++ b/pkgs/development/python-modules/xknxproject/default.nix @@ -2,10 +2,12 @@ , buildPythonPackage , cryptography , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder , pyzipper , setuptools +, wheel }: buildPythonPackage rec { @@ -22,8 +24,17 @@ buildPythonPackage rec { hash = "sha256-ZLBvhuLXEOgqS7tRwP/e1Dv1/EMqxqXgpAZtLQGIt/o="; }; + patches = [ + (fetchpatch { + name = "unpin-setuptools.patch"; + url = "https://github.com/XKNX/xknxproject/commit/53fecaf757d682fda00b04c3a2a1f3da86d9705f.patch"; + hash = "sha256-EpfgEq4pIx7ahqJZalzo30ruj8NlZYHcKHxFXCGL98w="; + }) + ]; + nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ From 430386449e988c0fa68c62d7ae24f14a19c37c07 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 8 Aug 2023 19:43:34 -0700 Subject: [PATCH 12/81] python3.pkgs.xknx: fix up build dependencies --- pkgs/development/python-modules/xknx/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 07615180608e..6151edfb5066 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -2,12 +2,14 @@ , async-timeout , buildPythonPackage , fetchFromGitHub +, fetchpatch , cryptography , ifaddr , pytest-asyncio , pytestCheckHook , pythonOlder , setuptools +, wheel }: buildPythonPackage rec { @@ -24,8 +26,17 @@ buildPythonPackage rec { hash = "sha256-rKvHb0wkWVuZO8M8uIQdOiY1N6DmGSpqUgz4YYbUfSM="; }; + patches = [ + (fetchpatch { + name = "unpin-setuptools.patch"; + url = "https://github.com/XKNX/xknx/commit/c0826aec52ab69b8bd81f600bea154fae16f334e.patch"; + hash = "sha256-EpfgEq4pIx7ahqJZalzo30ruj8NlZYHcKHxFXCGL98w="; + }) + ]; + nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ From 457c1541225997af713eed6d755e8d92dbb32713 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 02:51:38 +0000 Subject: [PATCH 13/81] kube-router: 1.5.4 -> 1.6.0 --- .../applications/networking/cluster/kube-router/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index a953a8b82be7..20788e6943f6 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-router"; - version = "1.5.4"; + version = "1.6.0"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - hash = "sha256-/ruSSq+iHmJDFHH+mLoqtdljAGlc15lXjTqq+luJIU8="; + hash = "sha256-3hfStQ87t8zKyRqUoUViAqRcI8AQXhYSwOGqwIm6Q/w="; }; - vendorHash = "sha256-U2TvH4TPBI6verEcyv0Z+ZFAKbADgzncJhW1IAJw4Ms="; + vendorHash = "sha256-kV5tUGhOm0/q5btOQu4TtDO5dVmACNNvDS7iNgm/Xio="; CGO_ENABLED = 0; From fe827278e5a1977c5a14d91d6841d2f760357456 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 8 Aug 2023 20:02:06 -0700 Subject: [PATCH 14/81] python3.pkgs.snowflake-connector-python: fix build dependencies --- .../snowflake-connector-python/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 3e1c35292d22..f5c929581a1c 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -18,6 +18,7 @@ , requests , setuptools , typing-extensions +, wheel }: buildPythonPackage rec { @@ -32,9 +33,26 @@ buildPythonPackage rec { hash = "sha256-F0EbgRSS/kYKUDPhf6euM0eLqIqVjQsHC6C9ZZSRCIE="; }; + # snowflake-connector-python requires arrow 10.0.1, which we don't have in + # nixpkgs, so we cannot build the C extensions that use it. thus, patch out + # cython and pyarrow from the build dependencies + # + # keep an eye on following issue for improvements to this situation: + # + # https://github.com/snowflakedb/snowflake-connector-python/issues/1144 + # + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"cython",' "" \ + --replace '"pyarrow>=10.0.1,<10.1.0",' "" + ''; + nativeBuildInputs = [ pythonRelaxDepsHook + setuptools + wheel ]; + pythonRelaxDeps = [ "pyOpenSSL" "charset-normalizer" From 117c34fb040ae1a3b98ac4b318c5ea18a571b593 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 8 Aug 2023 20:56:45 -0700 Subject: [PATCH 15/81] python3.pkgs.python-telegram-bot: 20.2 -> 20.4 --- .../python-modules/python-telegram-bot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index f496c15272df..cea69bf5b14b 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -19,16 +19,16 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "20.2"; + version = "20.4"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OdjTlVUjlw+5K/kvL1Yx+7c/lIE52udUo6Ux18M9xmE="; + hash = "sha256-owbJJZjBkMjsgfBLRl+rnePrIvQ0sUZs7rP9ie912pw="; }; propagatedBuildInputs = [ From b72c3a8fa94a5607fd1aec865a9f627fae07e967 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 9 Aug 2023 04:20:00 +0000 Subject: [PATCH 16/81] nodejs_16: 16.20.1 -> 16.20.2 Changelog: https://github.com/nodejs/node/releases/tag/v16.20.2 --- pkgs/development/web/nodejs/v16.nix | 4 ++-- pkgs/top-level/release.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 8b480d4440e8..d4bb94c07d3e 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -13,8 +13,8 @@ in # If you do upgrade here, please update in pkgs/top-level/release.nix # the permitted insecure version to ensure it gets cached for our users # and backport this to stable release (23.05). - version = "16.20.1"; - sha256 = "sha256-g+AzgeJx8aVhkYjnrqnYXZt+EvW+KijOt41ySe0it/E="; + version = "16.20.2"; + sha256 = "sha256-V28aA8RV5JGo0TK1h+trO4RlH8iXS7NjhDPdRNIsj0k="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 2ac81d0a237c..1747a32030e8 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -25,7 +25,7 @@ # and it will be too much painful for our users to recompile them # for no real reason. # Remove them for 23.11. - "nodejs-16.20.1" + "nodejs-16.20.2" "openssl-1.1.1v" ]; }; } From 25441183e246bb279ad04514cfc1ba8bce16d1e6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 9 Aug 2023 04:20:00 +0000 Subject: [PATCH 17/81] nodejs_18: 18.17.0 -> 18.17.1 Changelog: https://github.com/nodejs/node/releases/tag/v18.17.1 --- pkgs/development/web/nodejs/v18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 572f00a49a08..213f42718188 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -9,8 +9,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.17.0"; - sha256 = "01h4fzr0dpnhmd96hxhbb8dhyylp68j5ramrrh9w4fgaynnzmh40"; + version = "18.17.1"; + sha256 = "sha256-8hXPA9DwDwesC2dMaBn4BMFULhbxUtoEmAAirsz15lo="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch From 510f1b973325c6770cf9d2bd7b4374df1341ee74 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 9 Aug 2023 04:20:00 +0000 Subject: [PATCH 18/81] nodejs_20: 20.5.0 -> 20.5.1 Changelog: https://github.com/nodejs/node/releases/tag/v20.5.1 --- pkgs/development/web/nodejs/v20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index b1b5aea5768a..cfb90879c05d 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -9,8 +9,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.5.0"; - sha256 = "sha256-yzJ1aVje8cBOBpp5txtSymHtFZDBfyz6HuOvZB9y4Fg="; + version = "20.5.1"; + sha256 = "sha256-Q5xxqi84woYWV7+lOOmRkaVxJYBmy/1FSFhgScgTQZA="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch From 866601c98bf37f2c35c9e4e64847d2a91098798b Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 15 May 2023 15:14:49 +0800 Subject: [PATCH 19/81] python3Packages.gpib-ctypes: init at 0.3.0 --- .../python-modules/gpib-ctypes/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/gpib-ctypes/default.nix diff --git a/pkgs/development/python-modules/gpib-ctypes/default.nix b/pkgs/development/python-modules/gpib-ctypes/default.nix new file mode 100644 index 000000000000..42c07a9ef421 --- /dev/null +++ b/pkgs/development/python-modules/gpib-ctypes/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pytestCheckHook +, linux-gpib +}: + +buildPythonPackage rec { + pname = "gpib-ctypes"; + version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "gpib_ctypes"; + inherit version; + hash = "sha256-c9l6TNmM4PtbvopnnFi5R1dQ9o3MI39BHHHPSGqfjCY="; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace gpib_ctypes/gpib/gpib.py \ + --replace "libgpib.so.0" "${linux-gpib}/lib/libgpib.so.0" + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" + ''; + + pythonImportsCheck = [ + "gpib_ctypes.gpib" + ]; + + meta = with lib; { + description = "Cross-platform Python bindings for the NI GPIB and linux-gpib C interfaces"; + homepage = "https://github.com/tivek/gpib_ctypes/"; + changelog = "https://github.com/tivek/gpib_ctypes/blob/${version}/HISTORY.rst"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fsagbuya ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 50a9e9344fb7..1ac02242aa4c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4439,6 +4439,8 @@ self: super: with self; { gpaw = callPackage ../development/python-modules/gpaw { }; + gpib-ctypes = callPackage ../development/python-modules/gpib-ctypes { }; + gpiozero = callPackage ../development/python-modules/gpiozero { }; gplaycli = callPackage ../development/python-modules/gplaycli { }; From b10e62710b912a5599cde7a82b9f32d3c7b3d711 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 08:02:17 +0000 Subject: [PATCH 20/81] python310Packages.trimesh: 3.23.0 -> 3.23.1 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 4167a92e7ec3..6d7e549deabb 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.23.0"; + version = "3.23.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TjnN5gqzhsN2S/Acqio5pH33RW/Zp3acolI+B+sSaRA="; + hash = "sha256-2MQJJaTzpDeuk9BPLbzwWtbLC3jzd7ht2oGrVMCXRoc="; }; nativeBuildInputs = [ setuptools ]; From 5227cd452138cfe03b701a6041cbbcb2e5d37402 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 11:19:34 +0000 Subject: [PATCH 21/81] python310Packages.graphtage: 0.2.9 -> 0.3.0 --- pkgs/development/python-modules/graphtage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix index c33b1f603b1f..8b5e27a24134 100644 --- a/pkgs/development/python-modules/graphtage/default.nix +++ b/pkgs/development/python-modules/graphtage/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "graphtage"; - version = "0.2.9"; + version = "0.3.0"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GK83qSXFSCK/tiIfNfsaDfViDVzdhQNT90kB9wiTLbk="; + hash = "sha256-rzX5pSSPm3CjpnCm0gxsgUaeXho9dP7WTanCzBK6Yps="; }; postPatch = '' From 272b78361cebfe359036a5453199fa6d58a119b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 11:53:55 +0000 Subject: [PATCH 22/81] python310Packages.mkdocstrings-python: 1.2.1 -> 1.3.0 --- .../python-modules/mkdocstrings-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index dcd7a15fa7db..2322146d9bea 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.2.1"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-65c63K8u3aWJFeMIi0jOeRA7RXc1OWumys0LUOvgBEU="; + hash = "sha256-grcxAVyKfF3CtpjE+uuQe2jvz+xmKU/oHqgyqK7Erhc="; }; nativeBuildInputs = [ From 6afa15e0e33f01561da0e73a1d8cfd531c541b56 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 9 Aug 2023 20:23:09 +0800 Subject: [PATCH 23/81] cue: 0.5.0 -> 0.6.0 --- pkgs/development/tools/cue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 15e912e1f282..16def898b051 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cue"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - hash = "sha256-4E50VrekIkVXhzHVNehgm6/DbkofvqlNSgX9oK9SLu4="; + hash = "sha256-1svWb83xbVZIlI9pviCYfQ6Kkp0QRjZwrauL7PPJLts="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -f cmd/cue/cmd/script_test.go ''; - vendorHash = "sha256-0N0bZdimGHu3vkLe+eGKBTm/YeSQOnp+Pxhz3LVniTk="; + vendorHash = "sha256-ku4tPTXdnKau0kqnAAEHDdSF4oAC/6SDkTq8cECOiEk="; excludedPackages = [ "internal/ci/updatetxtar" "internal/cmd/embedpkg" "internal/cmd/qgo" "pkg/gen" ]; From 723f0b914839038679eb4db10cb242ff34770608 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 12:42:48 +0000 Subject: [PATCH 24/81] python310Packages.pyintesishome: 1.8.4 -> 1.8.5 --- pkgs/development/python-modules/pyintesishome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyintesishome/default.nix b/pkgs/development/python-modules/pyintesishome/default.nix index ceac634b3290..b0dea8b49bfd 100644 --- a/pkgs/development/python-modules/pyintesishome/default.nix +++ b/pkgs/development/python-modules/pyintesishome/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyintesishome"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "jnimmo"; repo = "pyIntesisHome"; rev = "refs/tags/${version}"; - hash = "sha256-+pXGB7mQszbBp4KhOYzDKoGFoUHATWLbOU6QwMIpGWU="; + hash = "sha256-QgIvIn8I5EtJSNj1FdOI+DPgG7/y2ToQ62dhk7flieo="; }; propagatedBuildInputs = [ From efa532e530ad62a3c96e8e1734634af22332dd2b Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 9 Aug 2023 09:52:54 -0400 Subject: [PATCH 25/81] kool: 2.1.0 -> 2.1.1 Diff: https://github.com/kool-dev/kool/compare/2.1.0...2.1.1 Changelog: https://github.com/kool-dev/kool/releases/tag/2.1.1 --- pkgs/development/tools/misc/kool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/kool/default.nix b/pkgs/development/tools/misc/kool/default.nix index 6da5586ca177..a435655fd5c4 100644 --- a/pkgs/development/tools/misc/kool/default.nix +++ b/pkgs/development/tools/misc/kool/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kool"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "kool-dev"; repo = "kool"; rev = version; - hash = "sha256-dMmokaFPzunpCdkJFVc3422SEKZNIOi8nzRB99Gi5Tg="; + hash = "sha256-Gtw+47EQVPxiW9xjY/cWlE4aJ1aYYhpvsVQzt0EnI8I="; }; vendorHash = "sha256-8t+OZB9jrlOVHLURPmtz0ent6COEOVMFfObe2LH1jRM="; From 1c5c22ec136c65f8b14c5d42180375e9870aaa19 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 9 Aug 2023 09:55:15 -0400 Subject: [PATCH 26/81] kool: add version test --- pkgs/development/tools/misc/kool/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/tools/misc/kool/default.nix b/pkgs/development/tools/misc/kool/default.nix index a435655fd5c4..370aebb3aca6 100644 --- a/pkgs/development/tools/misc/kool/default.nix +++ b/pkgs/development/tools/misc/kool/default.nix @@ -1,6 +1,8 @@ { lib , buildGoModule , fetchFromGitHub +, testers +, kool }: buildGoModule rec { @@ -22,6 +24,12 @@ buildGoModule rec { "-X=kool-dev/kool/commands.version=${version}" ]; + passthru.tests = { + version = testers.testVersion { + package = kool; + }; + }; + meta = with lib; { description = "From local development to the cloud: development workflow made easy"; homepage = "https://kool.dev"; From 34ce871bbd8fd0f587ff196762e2279749c6d936 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 9 Aug 2023 09:58:01 -0400 Subject: [PATCH 27/81] wazero: 1.3.1 -> 1.4.0 Diff: https://github.com/tetratelabs/wazero/compare/v1.3.1...v1.4.0 Changelog: https://github.com/tetratelabs/wazero/releases/tag/v1.4.0 --- pkgs/development/interpreters/wazero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/wazero/default.nix b/pkgs/development/interpreters/wazero/default.nix index f72f4be1fc50..880dbf321f82 100644 --- a/pkgs/development/interpreters/wazero/default.nix +++ b/pkgs/development/interpreters/wazero/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "wazero"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "tetratelabs"; repo = "wazero"; rev = "v${version}"; - hash = "sha256-gLiUEJdO/2btZb5D9O1r+uF3ZVBN4Oy3dFwqUNQRoW8="; + hash = "sha256-Yn5mg/K+RT6CoW1vMrpvRFOao83IAZE1mP+DGp4SmKk="; }; vendorHash = null; From 33bf1c9273e1addc93085f72c84d2bd2067f9a6f Mon Sep 17 00:00:00 2001 From: Janik H Date: Thu, 15 Jun 2023 09:42:13 +0200 Subject: [PATCH 28/81] anytone-emu: init at unstable-2023-06-15 --- .../applications/radio/anytone-emu/Cargo.lock | 742 ++++++++++++++++++ .../radio/anytone-emu/default.nix | 42 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 786 insertions(+) create mode 100644 pkgs/applications/radio/anytone-emu/Cargo.lock create mode 100644 pkgs/applications/radio/anytone-emu/default.nix diff --git a/pkgs/applications/radio/anytone-emu/Cargo.lock b/pkgs/applications/radio/anytone-emu/Cargo.lock new file mode 100644 index 000000000000..e3c95f2d62b6 --- /dev/null +++ b/pkgs/applications/radio/anytone-emu/Cargo.lock @@ -0,0 +1,742 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "CoreFoundation-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0e9889e6db118d49d88d84728d0e964d973a5680befb5f85f55141beea5c20b" +dependencies = [ + "libc", + "mach", +] + +[[package]] +name = "IOKit-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99696c398cbaf669d2368076bdb3d627fb0ce51a26899d7c61228c5c0af3bf4a" +dependencies = [ + "CoreFoundation-sys", + "libc", + "mach", +] + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "anytone-emu" +version = "0.1.0" +dependencies = [ + "clap", + "home", + "log", + "nix", + "serialport", + "stderrlog", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[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 = "bitflags" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" + +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[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.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "clap" +version = "4.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80672091db20273a15cf9fdd4e47ed43b5091ec9841bf4c6145c9dfbbcae09ed" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636" +dependencies = [ + "anstream", + "anstyle", + "bitflags 1.3.2", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +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 = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys", +] + +[[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", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "libc" +version = "0.2.146" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" + +[[package]] +name = "libudev" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b324152da65df7bb95acfcaab55e3097ceaab02fb19b228a9eb74d55f135e0" +dependencies = [ + "libc", + "libudev-sys", +] + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "mach" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd13ee2dd61cc82833ba05ade5a30bb3d63f7ced605ef827063c63078302de9" +dependencies = [ + "libc", +] + +[[package]] +name = "mach2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset", + "pin-utils", + "static_assertions", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "proc-macro2" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" + +[[package]] +name = "rustix" +version = "0.37.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +dependencies = [ + "bitflags 1.3.2", + "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 = "serialport" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353dc2cbfc67c9a14a89a1292a9d8e819bd51066b083e08c1974ba08e3f48c62" +dependencies = [ + "CoreFoundation-sys", + "IOKit-sys", + "bitflags 2.0.2", + "cfg-if", + "libudev", + "mach2", + "nix", + "regex", + "scopeguard", + "winapi", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "stderrlog" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69a26bbf6de627d389164afa9783739b56746c6c72c4ed16539f4ff54170327b" +dependencies = [ + "atty", + "chrono", + "log", + "termcolor", + "thread_local", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "unicode-ident" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/applications/radio/anytone-emu/default.nix b/pkgs/applications/radio/anytone-emu/default.nix new file mode 100644 index 000000000000..eea51546057e --- /dev/null +++ b/pkgs/applications/radio/anytone-emu/default.nix @@ -0,0 +1,42 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, udev +}: + +rustPlatform.buildRustPackage rec { + pname = "anytone-emu"; + version = "unstable-2023-06-15"; + + src = fetchFromGitHub { + owner = "hmatuschek"; + repo = "anytone-emu"; + rev = "c6a63b1c9638b48ed0969f90a5e11e2a5fe59458"; + hash = "sha256-Y+7DkenYiwnfVWtMwmtX64sUN7bBVoReEmZQfEjHn8o="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + udev + ]; + + meta = with lib; { + description = "A tiny emulator for AnyTone radios"; + homepage = "https://github.com/hmatuschek/anytone-emu"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ janik ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25c408635a47..263ce32f60d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29455,6 +29455,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + anytone-emu = callPackage ../applications/radio/anytone-emu { }; + anytype = callPackage ../applications/misc/anytype { }; ao = libfive; From 9d519307e3fe4c799c46ff17384046611586f766 Mon Sep 17 00:00:00 2001 From: Janik H Date: Sat, 27 May 2023 22:59:12 +0200 Subject: [PATCH 29/81] zitadel-tools: init at 0.4.0 --- pkgs/tools/misc/zitadel-tools/default.nix | 30 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/misc/zitadel-tools/default.nix diff --git a/pkgs/tools/misc/zitadel-tools/default.nix b/pkgs/tools/misc/zitadel-tools/default.nix new file mode 100644 index 000000000000..64bf37eefbb4 --- /dev/null +++ b/pkgs/tools/misc/zitadel-tools/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "zitadel-tools"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "zitadel"; + repo = "zitadel-tools"; + rev = "v${version}"; + hash = "sha256-yKSpWvv/xW7ID0KhPIsrZOEWuuhEqpJuiswqO71ooEw="; + }; + + vendorHash = "sha256-ZS8m3zjLWvX3kFty2jpObw+rfyozJ3yDfZBcFCdD96U="; + + ldflags = [ + "-s" "-w" + "-X main.version=${version}" + ]; + + meta = with lib; { + description = "Helper tools for zitadel"; + homepage = "https://github.com/zitadel/zitadel-tools"; + license = licenses.asl20; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51898095899d..e820bb3d6f91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24732,6 +24732,8 @@ with pkgs; zita-resampler = callPackage ../development/libraries/audio/zita-resampler { }; + zitadel-tools = callPackage ../tools/misc/zitadel-tools { }; + zix = callPackage ../development/libraries/audio/zix { }; zz = callPackage ../development/compilers/zz { }; From 14f7b1161d334ff77fb98bdc876c6aea04445656 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 9 Aug 2023 16:57:57 +0200 Subject: [PATCH 30/81] nixos/tests/nextcloud: Fix deprecation warning --- nixos/tests/nextcloud/basic.nix | 4 ++-- nixos/tests/nextcloud/openssl-sse.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index db5cee9f6584..b7af6d6d7364 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -90,8 +90,8 @@ in { test -e graph grep "$what" graph >$out || true ''; - nextcloudUsesImagick = findInClosure "imagick" nodes.nextcloud.config.system.build.vm; - nextcloudWithoutDoesntUseIt = findInClosure "imagick" nodes.nextcloudWithoutMagick.config.system.build.vm; + nextcloudUsesImagick = findInClosure "imagick" nodes.nextcloud.system.build.vm; + nextcloudWithoutDoesntUseIt = findInClosure "imagick" nodes.nextcloudWithoutMagick.system.build.vm; in '' assert open("${nextcloudUsesImagick}").read() != "" assert open("${nextcloudWithoutDoesntUseIt}").read() == "" diff --git a/nixos/tests/nextcloud/openssl-sse.nix b/nixos/tests/nextcloud/openssl-sse.nix index 92beb869eb03..d6ea39c6155a 100644 --- a/nixos/tests/nextcloud/openssl-sse.nix +++ b/nixos/tests/nextcloud/openssl-sse.nix @@ -49,8 +49,8 @@ in { #!${pkgs.runtimeShell} echo 'bye' | ${withRcloneEnv3} ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file2 ''; - openssl1-node = nodes.nextcloudwithopenssl1.config.system.build.toplevel; - openssl3-node = nodes.nextcloudwithopenssl3.config.system.build.toplevel; + openssl1-node = nodes.nextcloudwithopenssl1.system.build.toplevel; + openssl3-node = nodes.nextcloudwithopenssl3.system.build.toplevel; in '' nextcloudwithopenssl1.start() nextcloudwithopenssl1.wait_for_unit("multi-user.target") From 701af8d9374c4fc316b5617e8b6907d2b36a678f Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 9 Aug 2023 11:32:40 -0400 Subject: [PATCH 31/81] vimPlugins.replacer-nvim: init at 2023-07-29 --- pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c608b23256d2..710ce3cbee10 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -692,6 +692,7 @@ https://github.com/theprimeagen/refactoring.nvim/,, https://github.com/tversteeg/registers.nvim/,, https://github.com/vladdoster/remember.nvim/,, https://github.com/filipdutescu/renamer.nvim/,, +https://github.com/gabrielpoca/replacer.nvim/,HEAD, https://github.com/NTBBloodbath/rest.nvim/,, https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim https://github.com/gu-fan/riv.vim/,, From 0471581350afcb3e17f9cbd71e60acacc0c8fb48 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 9 Aug 2023 11:34:25 -0400 Subject: [PATCH 32/81] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 216 +++++++++--------- 1 file changed, 114 insertions(+), 102 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7159b3f148e0..7ea322dda9e9 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-08-07"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "335c2f9e130b90a92a1bfac448bb9915894fb5b6"; - sha256 = "1zgbxqv1n4mnl5l4y1z33kb5g372jwfjxhqpsq8fvk4ilv0g2xfh"; + rev = "bde2101ad0b6f9af67aec02817985ae52ec3bac1"; + sha256 = "18319famm8d4gsck4n2v2yghb3d91fjcrnlmp85v0p146gc5k9l3"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -377,12 +377,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-08-07"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "1c2832a0a70b4908cd4334593df6ec81c479e6d8"; - sha256 = "0dfmgv6zmabx1zqqz68qcgl9a2jnmiq3nxlpw5lym4jvrss8pyad"; + rev = "100aa31e52b13e69d61caeb1796581e4bbb3b9ca"; + sha256 = "1ygswc0l9q8m3h3b42ik5zkhf820xpzs1iiivf2x7wpqc8589j2v"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -847,12 +847,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2023-06-13"; + version = "2023-08-08"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "7afbb149f87be279778689596c781882014f7eef"; - sha256 = "07v8ssjrl5ayrayyg5k137xzv2pcpha0m4y41qyyf0ys150nnqvf"; + rev = "c61fa86a43fde1ad6b503fd14002260dbaa4d923"; + sha256 = "0hgdyfs7f9k511vlp5xdna6dgd1dbcxnzkify6mi6m69pbay5h0j"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -1231,12 +1231,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2023-08-07"; + version = "2023-08-08"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "62bd10d662d1845934c8173788a9f514e23ae925"; - sha256 = "0ydl4qbvcjzzylgrm3nggxa6i2gv0dvb612ad6f98lqf1njaz30p"; + rev = "0805b8630b24f028f28151c04c1d8291adf4bdb0"; + sha256 = "16jzq1rh86cd6cwkgxvfj500msmlmld0zkxkiq5pmbmcawbkhmz6"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -2395,12 +2395,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2023-07-02"; + version = "2023-08-08"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "4ce7c51b881e58f1e2f8f437f30e4e583cbac319"; - sha256 = "1j3812in0wr2ssc79gqibf446awlf5j1pv5xp2qpyrp4di79y7va"; + rev = "d5caf28aba49e81ac4099426231f3cf3c151013a"; + sha256 = "166yinmn8fqmsgdbswn0vjcz3c3d7axckzwkrsz7v8vk9yhnmnyk"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2973,12 +2973,12 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2023-08-07"; + version = "2023-08-08"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "713b56e13c58ad519920e0e634763345cb4fc832"; - sha256 = "0a0hfiaxd5mn5197wciamacx8s99m917vzqmvvl97839yap00xl9"; + rev = "c0b67f3e2950adc07b555d3e73e38275b4a585ce"; + sha256 = "1kc22lhvz89bx94ysh5l4xn3s1r49lqivzg9fz7rrh1v7zwndlfz"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -3070,12 +3070,12 @@ final: prev: elixir-tools-nvim = buildVimPluginFrom2Nix { pname = "elixir-tools.nvim"; - version = "2023-08-01"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "4fd1c3df49a4f410ac8ae63de4189e3e534a742e"; - sha256 = "0imd25gi96g5fq988dlk1w60hcpgdxbhzln74sj2qk2h076ffn57"; + rev = "adb51b4ff66ccd1ece8d77e2f88e2a90bfa4a9df"; + sha256 = "1ks96nn4q1rr7pp327avxx5frni00yfs8ysfnni61nkbc91dw5ns"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3720,12 +3720,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-08-08"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "287fffb410ce82d19da2d503a1f1570adf7b7874"; - sha256 = "00cg45dascmbnfmb0lhvxcm82f597bmmy5sh003c0amsn0zc7k30"; + rev = "bae45ef449d8811061cc940459e70e883a3aa83a"; + sha256 = "0ns6qhw79fjxns6x36474dsl6ihqw2sxxm126bpgi9612cq134gs"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3780,12 +3780,12 @@ final: prev: go-nvim = buildVimPluginFrom2Nix { pname = "go.nvim"; - version = "2023-08-08"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "44bd0589ad22e2bb91f2ed75624c4a3bab0e5f59"; - sha256 = "15s8k9hb6j63xj0q6b3ir1m76diyh4wf8p82606yd142jnin80ni"; + rev = "c61f9371cdaaec40cccf0783ff968bee83df5bda"; + sha256 = "0ij9b42qagjaakvckqq1gpja93qy1hw83lqj8lpl0ysqwx5q4dnq"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -5051,12 +5051,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-07-28"; + version = "2023-08-08"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "7bcbd67298237d4c7a958715bc99f25f20702c6e"; - sha256 = "0q61hfk3dsa6pgx25iqxz4r1r25mcizi0lbyvv88nn5fdvg8lv74"; + rev = "fc3a15047a5b831c83143d90cd25d0b7bcfd0111"; + sha256 = "0rzipjbzb57hwgclbpjww9vgn3x2arp8a831lfc4a0ij8cr223cc"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5291,12 +5291,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-07-25"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "fe9e34a9ab4d64321cdc3ecab4ea1809239bb73f"; - sha256 = "1yvf5hml1nhglmfaa0da5mjmgxaysc8x8k1rk820vpj5f1bhl70p"; + rev = "74eac861b013786bf231b204b4ba9a7d380f4bd9"; + sha256 = "0d0h93q23k8l6czxy5sql595dsqk901aqhmsmincawnycin2ip0x"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5363,24 +5363,24 @@ final: prev: melange-nvim = buildVimPluginFrom2Nix { pname = "melange-nvim"; - version = "2023-07-09"; + version = "2023-08-08"; src = fetchFromGitHub { owner = "savq"; repo = "melange-nvim"; - rev = "e4958aa60ec6e1c5ecb487b9028da3a33e753b34"; - sha256 = "0ck5f47hww48msqq7qpbd3rcg5mjwf87lf4zwg9k27vfln1sfg90"; + rev = "11f35df3e091f35e966a335ed90b0d8a03851ffd"; + sha256 = "0s0pb1cgx40zcxjy7axx06ix4zl5f8i3gi86rqy2qsagzp1adbf6"; }; meta.homepage = "https://github.com/savq/melange-nvim/"; }; mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-08-06"; + version = "2023-08-08"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "98398ff0a803b1c40354f5591ae59766b88e01a7"; - sha256 = "0a49cx19ln8yxr47afr3424qkqp03qhg6ram7mpql1w892f3gp6n"; + rev = "1b52c4ce7880b95d6c80eeb3cfe8e2da27d19db4"; + sha256 = "02262ykxldwxhwf6aw0q9hsz3qda43qcj770hmr1fn6xmg4b6zyl"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5771,12 +5771,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-08-05"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "9f0205a08757711f57589a1dffa8abf525f4a23b"; - sha256 = "1bhwzpsg8ajk6nr6lcfxfmshssj0fk645j04x3r6yfzdyynmrsvi"; + rev = "461519d5a0023a73cb46d21392751d0731eacec8"; + sha256 = "0fzz3hhg3arc789prpmvlijmcvl4djax9ry78jzyvipbybcr33s2"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5807,12 +5807,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-08-08"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "09f8f64d5b28ad3dcdc173beb60efe6a78301064"; - sha256 = "0bz3gjbjlibr4qvkibg9c59gpynxmi3mrza5ild9zdfjixl1zx11"; + rev = "5588603ce59d4b0c2f7c12493356b14c6b150488"; + sha256 = "0jrw02yxazjj4s0akkzqfl4jnadjjqs4ass8gisbpmi9rydvs9mk"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -5867,12 +5867,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-08-07"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "92f2e9d4a7bfdbb7ed0e9dcd9b8768db63188149"; - sha256 = "1li3mci8n9cqpjdcb3nm769aa7c4ydia9br3k0gbmmd5pgn98v9q"; + rev = "66e5a4e4ed7645590ac8388abdedb8f840b88f0d"; + sha256 = "13bknfk2vhc9k8jcfgdf96nmi7g6b1c4n54dkwqrils6dycv0qcp"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6083,12 +6083,12 @@ final: prev: neotest-rspec = buildVimPluginFrom2Nix { pname = "neotest-rspec"; - version = "2023-07-29"; + version = "2023-08-08"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "7f03e1e1f8cc18f9dd22ebccdff254cd7b167fbd"; - sha256 = "10w1qh18j9p1s06r96m5d7f1izs2vgi74fihhmy4gqc4d8gqvn3r"; + rev = "df53627929924ffd716d5ff5de79da17cd4baa95"; + sha256 = "1qm1mhv8bk3qj7gywxn913qyba37p9ly52zbw9554qxda1jjwc9x"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; @@ -6455,12 +6455,12 @@ final: prev: nvchad = buildVimPluginFrom2Nix { pname = "nvchad"; - version = "2023-08-06"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "6766acefece875c46948fb25f9231a1ace6a11a1"; - sha256 = "1chv0qyc4k53bpvdb9kdm4r31y0p0m65fskn256v2k01jk0vrdxw"; + rev = "46a61073a82087f9e339dab6de2b2f94c051b070"; + sha256 = "0349b6wxscn3pn0vg73y6kqid1kdvska80k3g7fykdwd9gswb75v"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6827,12 +6827,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-07-29"; + version = "2023-08-08"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "dde074b6465fef5125d190e9a85ae827cf09283f"; - sha256 = "1higwr7xr9cnsh1aan3sypxpzhwakq29sjwiw8sb9gvhyvjj7ksk"; + rev = "5967a08f32801782fcf34dad1877a3228f9e2fc5"; + sha256 = "0wp5sv25dfn68a6vfv96hgs6wmc9cjxwzg4mg0j9mw3kl2bhwc48"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6959,12 +6959,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-08-04"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "c0de180ddb3df36feef8ac3607670894d0e7497f"; - sha256 = "0j1ymayx1c1dycgc50gvq8iv029slc6wzlpj0mbyh60g0wjp7flc"; + rev = "7c73a4dc44c3d62ee79ab9f03ba313251c0388d4"; + sha256 = "0k7cly9xmjgpq55izxk3kcrc6289fra3pcpkisslr9jj6qzq3bfq"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7295,12 +7295,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-08-08"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "a9ce9fb7cccf59e0c2f65d26a14942356c93948e"; - sha256 = "0agl2wl6x378dfa4am36vcd2gdrflb98fssaywicdzlghw9yba4k"; + rev = "80cee52d445363c8bd08eacca17be31e3837f4d0"; + sha256 = "0ny0vaz6idv0zn5f90yj33bscm9apd356gh2xfdwill5n0ly29m8"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -7534,12 +7534,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-07-18"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "eaa20a6aee7c4df89d80ec8208de63ec2fa4d38a"; - sha256 = "0zyp32nb0xa882i6rjwgs94icpmwpww22g7v1laz0ldm4vkn0qlj"; + rev = "0e5fca35cdc743cf3a448cea1a6251cf25cebafa"; + sha256 = "16imjy6hyy9k1s6krkwl1z5vlra81a6fig2553hmwgndi7cjg3x8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8078,12 +8078,12 @@ final: prev: quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2023-08-01"; + version = "2023-08-08"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "ba61c6250c637a1bc59f7023c23bcaf75e6767cd"; - sha256 = "10nxagk6wmsmqw03933mbzcph8xg0879qymzjmxjrwrc99vw9l7v"; + rev = "256d81e391a22eeb53791ff62ce65f870418fa71"; + sha256 = "037x5lrpgli46a71x05x35ig9jh8l9qsv2azx5s0g78xja6kih2d"; }; meta.homepage = "https://github.com/unblevable/quick-scope/"; }; @@ -8256,6 +8256,18 @@ final: prev: meta.homepage = "https://github.com/filipdutescu/renamer.nvim/"; }; + replacer-nvim = buildVimPluginFrom2Nix { + pname = "replacer.nvim"; + version = "2023-07-29"; + src = fetchFromGitHub { + owner = "gabrielpoca"; + repo = "replacer.nvim"; + rev = "32e1713230844fa52f7f0598c59295de3c90dc95"; + sha256 = "0qisyii60gn5siahxc30xham2asmkrch8ph2fs9qk1kdr64h33d5"; + }; + meta.homepage = "https://github.com/gabrielpoca/replacer.nvim/"; + }; + rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; version = "2023-07-16"; @@ -8522,12 +8534,12 @@ final: prev: sg-nvim = buildVimPluginFrom2Nix { pname = "sg.nvim"; - version = "2023-08-04"; + version = "2023-08-08"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "2dcef6717643063ebb4215fe7b53ca9bc08c8423"; - sha256 = "1n11m3gh7ldbgw9vw3k50pb27qfarf99ixrsp5s00ykxwkqcckqc"; + rev = "6138d659f6a98ebf08d1a9206b456b792b17d52c"; + sha256 = "0gf533dgin5s6rn7d0wxzz87223vlb9kd8zz6mbwya8bh7gw9966"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -8848,12 +8860,12 @@ final: prev: ssr-nvim = buildVimPluginFrom2Nix { pname = "ssr.nvim"; - version = "2023-04-17"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "e5768511518a397fa712f26389ba30d0404990de"; - sha256 = "0bw60qf49bb07vhxpg21fkf5v2am4ply3x4z5y5c24lx19fwmryw"; + rev = "bc9c0d2dd765dafc1b8fecb28d0a317e7913b81f"; + sha256 = "18hhbq1fbsab3g3n4mj09jwapzra7754hp23w6dsv4nvf8rq27qc"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; @@ -9282,12 +9294,12 @@ final: prev: telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2023-08-07"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "54de6e45b958e37a2eca4dca22572b6c08866177"; - sha256 = "0kp6j2w1sfk28h7kxa9bhmqpav13r5qsmrdngcsdxpj5ffzpbyls"; + rev = "251fdb32d21321fec7bd3c39a3a8bc87b04145d4"; + sha256 = "1bpk0shd4q2rbj4dk1d729ixdhxlpll023smnwcxrpnfjydygvr3"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -9403,12 +9415,12 @@ final: prev: telescope-sg = buildVimPluginFrom2Nix { pname = "telescope-sg"; - version = "2023-08-04"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "Marskey"; repo = "telescope-sg"; - rev = "b599ae559d80cec643cf6d9478c745ea218c4642"; - sha256 = "0zgjhghl335b2nqhsiqkymrf9sml1pwhwv7hv3rkzqhyw66fxhlm"; + rev = "2e770cda77cb893035a5db5e67ea3ff45e6fc458"; + sha256 = "1pgc3va2j7wp49aq0kxnsqlybl0xa668y9xwqfznpxdpr09vlvln"; }; meta.homepage = "https://github.com/Marskey/telescope-sg/"; }; @@ -9981,12 +9993,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-08-07"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "5e428a7701005710ac05e9bf30d1547edd8f25e9"; - sha256 = "1sjx8bvl09i9fycxw5wad6gc95wg8l262npkxs1a1qfx46nrj551"; + rev = "388d0b9051fc8bf2d5f96285ac2800835b0d696a"; + sha256 = "1cai2vzi456djxbnq0yi1inn5n4jzwwr2qffcr21v4jl823i603k"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -13524,12 +13536,12 @@ final: prev: vim-prosession = buildVimPluginFrom2Nix { pname = "vim-prosession"; - version = "2023-08-04"; + version = "2023-08-08"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "9069e5cefff48c2ed286f2576df6137e803992a5"; - sha256 = "0xaz03xx9m7r24p6bn3ddaxksnc1q8y1xg4lrs8mh2yvip3xb5mw"; + rev = "3099aaea29b072525b2b387ef0375079da3cc1ed"; + sha256 = "1yd0kgjgv8gjp5dnk3r2pgi4b4cbk1d8zy52ayh2lzspxfhihphy"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; @@ -14353,12 +14365,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2023-08-05"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "9adeb20fb444430b3bfe4033ad487cf4377dddf4"; - sha256 = "0ip42nasckz2kw4krlgil4yg6pzh8saa259nxvjdxnq7xm2n5ynp"; + rev = "7cb4ae5212451266a1f643642d47474063a99de4"; + sha256 = "1xqlp1b54ssvfw7p212bmd10ccsjz77rm3vnvhs955f0blg80ji5"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -15085,12 +15097,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2023-08-03"; + version = "2023-08-08"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "61fb528c592082029d2f927c503b0040236c81a6"; - sha256 = "06f9ymz265ly6hl9pnnk7mm2q8k7x1lmr61hcjrgbca32xqijj83"; + rev = "cfbcabb31f0407a21fc4ee72c0ba9e050198fe2f"; + sha256 = "0b7sc7a6hycswdn7anyyrfrgpvlzci7w23s0fxlzsacyff3ijcj1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -15362,12 +15374,12 @@ final: prev: wrapping-nvim = buildVimPluginFrom2Nix { pname = "wrapping.nvim"; - version = "2023-05-28"; + version = "2023-08-08"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "wrapping.nvim"; - rev = "5e87f1424c86c50d3bc205830aa56ed1cad45467"; - sha256 = "0byca5y7jz9lkb3f5rj97ckazymaz1wlgc3gyjsdzngc9dfliqcx"; + rev = "1fc811d99b512ca53a4a773580f9ed5394fe6b2a"; + sha256 = "01j0whf2f4bzkq9p1bdpf7bhj1v7sj1bzdq47xck1f7fkkk2i8cr"; }; meta.homepage = "https://github.com/andrewferrier/wrapping.nvim/"; }; @@ -15627,12 +15639,12 @@ final: prev: nightfly = buildVimPluginFrom2Nix { pname = "nightfly"; - version = "2023-08-06"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "903da3ef1e41c6c763c9f98de6f2f9dc193ca5e7"; - sha256 = "09bw1ss09a3qfsyw40s1y7jsyd6r3i1gricxdxa5q4x9llsj9qsa"; + rev = "e5638253af9bc27b81a129690cd9a9a7fcf79f4d"; + sha256 = "1fq5qx87ybqqi7zlvy9sb2avkpswj20z44lg7cnlw0g5vc4wm7jv"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -15663,12 +15675,12 @@ final: prev: nvchad-ui = buildVimPluginFrom2Nix { pname = "nvchad-ui"; - version = "2023-07-29"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "1d4267f47fc022c66af87261f49c32b9a05273cf"; - sha256 = "089a3ipja9x0giy29xa01w752rzlfhm6m4nbxd1g0kalh7fypjv3"; + rev = "a1d613347cb8fc3b00510f53f18a0cf5e876aaf1"; + sha256 = "0gy3bx02x1plpvbs6xpylg0i4d7gaqsickbcbnrwz2b93jz2rg94"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; From fa45115a262e308f2930bbc48f9703bb407434a7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 9 Aug 2023 11:35:25 -0400 Subject: [PATCH 33/81] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index f4e5d73aa25e..e4ea2c24e576 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -854,11 +854,11 @@ }; htmldjango = buildGrammar { language = "htmldjango"; - version = "0.0.0+rev=11e73eb"; + version = "0.0.0+rev=717e83a"; src = fetchFromGitHub { owner = "interdependence"; repo = "tree-sitter-htmldjango"; - rev = "11e73ebd8e73356badaad826a0534437b208b6e7"; + rev = "717e83aefd328735beeeb671f3f95b2624e70c57"; hash = "sha256-xOWR5Lp9Ggkqmm5rutKrnMNXFASdyn6vPtxcY2mu2zs="; }; meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango"; @@ -1696,12 +1696,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=a2f36c2"; + version = "0.0.0+rev=f14629b"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "a2f36c2477859110d5b7b675f395e50241fbc004"; - hash = "sha256-/GT4SwYit6IwWgEadPMEyXVtmXdwomWUrDMdlTHS6Qs="; + rev = "f14629b4d53f72356ce8f6d4ac8c54d21b4e74dd"; + hash = "sha256-SRj4iF1qS2jEFaIkRfXzAmzG7jKeSzKv5/GdXKbKRjU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1796,12 +1796,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=a000dd8"; + version = "0.0.0+rev=3dfa1b1"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "a000dd8930464c71fa6fec9be4fdd6198068393c"; - hash = "sha256-37nN/Zh84iTmmpZ804rnb/7oXzQqOk7ub1FbkCMlT28="; + rev = "3dfa1b1fafac51e3ffc39064eafb26b5111861a2"; + hash = "sha256-sDXYfILv+7/fGIaWp4SOfsjZ67Mi3UPnpt9NEapKZ+M="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2176,12 +2176,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=df94899"; + version = "0.0.0+rev=6ae93e3"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "df94899fcee25e2da32744760aa4394d2e728a33"; - hash = "sha256-4mp3m029/3Kvke8NXbLQmE3qZa+c9I6x6nht1AckSgA="; + rev = "6ae93e3950b12b6c1b3881e4d347263574222c4e"; + hash = "sha256-Ik5RaizsMVF+ObB1HzmwzMdmYzwH1TJ342TXDrKqFFs="; }; location = "libs/tree-sitter-wing"; generate = true; From e7417ae1c2c37680834993e7b1c4f914db507fb3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 9 Aug 2023 11:36:33 -0400 Subject: [PATCH 34/81] vimPlugins.sg-nvim: fix cargoHash --- pkgs/applications/editors/vim/plugins/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index dbf95e35dd35..6b6040bddeab 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -947,7 +947,7 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-MJUEGzV756zWCHGAcdm9uU8DpoX6b1G8C2bRWy4QCfE="; + cargoHash = "sha256-cDlqJBx9p/rA+OAHZW2GcOiQmroU66urZ+qv2lXhg/4="; nativeBuildInputs = [ pkg-config ]; From 735d9c7fc3d34cba643d89965b938180375645f0 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 8 Aug 2023 21:08:11 -0700 Subject: [PATCH 35/81] python3.pkgs.async-generator: rename from async_generator --- pkgs/applications/networking/gns3/server.nix | 2 +- pkgs/development/python-modules/aiohttp/default.nix | 4 ++-- pkgs/development/python-modules/asks/default.nix | 4 ++-- .../{async_generator => async-generator}/default.nix | 2 +- pkgs/development/python-modules/geopy/default.nix | 4 ++-- pkgs/development/python-modules/jupyterhub/default.nix | 4 ++-- pkgs/development/python-modules/nbclient/default.nix | 4 ++-- pkgs/development/python-modules/pyinsteon/default.nix | 4 ++-- pkgs/development/python-modules/pytest-trio/default.nix | 4 ++-- pkgs/development/python-modules/trio/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 12 files changed, 21 insertions(+), 20 deletions(-) rename pkgs/development/python-modules/{async_generator => async-generator}/default.nix (88%) diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index e7c548c67d08..fef781e1c0c6 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication { aiofiles aiohttp aiohttp-cors - async_generator + async-generator distro importlib-resources jinja2 diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index bfe6bc06199b..e2e2ebac9ae5 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -21,7 +21,7 @@ , typing-extensions , idna-ssl # tests_require -, async_generator +, async-generator , freezegun , gunicorn , pytest-mock @@ -80,7 +80,7 @@ buildPythonPackage rec { # NOTE: pytest-xdist cannot be added because it is flaky. See https://github.com/NixOS/nixpkgs/issues/230597 for more info. nativeCheckInputs = [ - async_generator + async-generator freezegun gunicorn pytest-mock diff --git a/pkgs/development/python-modules/asks/default.nix b/pkgs/development/python-modules/asks/default.nix index 088e946c93d1..8be9a9b21160 100644 --- a/pkgs/development/python-modules/asks/default.nix +++ b/pkgs/development/python-modules/asks/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchFromGitHub , anyio -, async_generator +, async-generator , h11 , curio , overly @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ anyio - async_generator + async-generator h11 ]; diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async-generator/default.nix similarity index 88% rename from pkgs/development/python-modules/async_generator/default.nix rename to pkgs/development/python-modules/async-generator/default.nix index e80fd914c19c..17014a410d4c 100644 --- a/pkgs/development/python-modules/async_generator/default.nix +++ b/pkgs/development/python-modules/async-generator/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "async_generator"; inherit version; - sha256 = "6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"; + hash = "sha256-brs9EGwSkgqq5CzLb3h+9e79zdFm6j1ij6hHar5xIUQ="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index ca50920b188e..1ca084d999cd 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -1,5 +1,5 @@ { lib -, async_generator +, async-generator , buildPythonPackage , docutils , fetchFromGitHub @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - async_generator + async-generator docutils pytestCheckHook pytz diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 9dea973b042f..b1bb40ad70f7 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -5,7 +5,7 @@ , fetchPypi , fetchzip , alembic -, async_generator +, async-generator , certipy , python-dateutil , entrypoints @@ -113,7 +113,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ # https://github.com/jupyterhub/jupyterhub/blob/master/requirements.txt alembic - async_generator + async-generator certipy python-dateutil entrypoints diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 6f0d85ff9203..6c386ee01854 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -1,4 +1,4 @@ -{ async_generator +{ async-generator , buildPythonPackage , fetchFromGitHub , hatchling @@ -36,7 +36,7 @@ let nbclient = buildPythonPackage rec { ]; propagatedBuildInputs = [ - async_generator + async-generator traitlets nbformat nest-asyncio diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 22c044e68b81..1747fc677398 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -1,7 +1,7 @@ { lib , aiofiles , aiohttp -, async_generator +, async-generator , buildPythonPackage , fetchFromGitHub , pypubsub @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - async_generator + async-generator pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix index e65e494a5409..36f31a0288c8 100644 --- a/pkgs/development/python-modules/pytest-trio/default.nix +++ b/pkgs/development/python-modules/pytest-trio/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, trio, async_generator, hypothesis, outcome, pytest }: +, trio, async-generator, hypothesis, outcome, pytest }: buildPythonPackage rec { pname = "pytest-trio"; @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ trio - async_generator + async-generator outcome ]; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 194dc3f71856..fb985e890a77 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder , attrs , sortedcontainers -, async_generator +, async-generator , exceptiongroup , idna , outcome @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs sortedcontainers - async_generator + async-generator idna outcome sniffio diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5759fc0ba120..9a2fc3586909 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -45,6 +45,7 @@ mapAliases ({ apache-airflow = throw "apache-airflow has been moved out of pythonPackages and is available as a standalone package"; # added 2023-06-05 argon2_cffi = argon2-cffi; # added 2022-05-09 APScheduler = apscheduler; # added 2023-02-19 + async_generator = async-generator; # added 2023-08-08 async_stagger = async-stagger; # added 2023-08-08 asyncio-nats-client = nats-py; # added 2022-02-08 awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4757bf750eb..e61c411a31e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -736,10 +736,10 @@ self: super: with self; { asyauth = callPackage ../development/python-modules/asyauth { }; - async_generator = callPackage ../development/python-modules/async_generator { }; - async-dns = callPackage ../development/python-modules/async-dns { }; + async-generator = callPackage ../development/python-modules/async-generator { }; + async-interrupt = callPackage ../development/python-modules/async-interrupt { }; async-lru = callPackage ../development/python-modules/async-lru { }; From 2644f7e83c3e97ce973b95c2ae1e7ceff5a336bf Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Sep 2022 21:34:36 +0200 Subject: [PATCH 36/81] python3Packages.pyunpack: init at 0.3 --- .../python-modules/pyunpack/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/pyunpack/default.nix diff --git a/pkgs/development/python-modules/pyunpack/default.nix b/pkgs/development/python-modules/pyunpack/default.nix new file mode 100644 index 000000000000..b6dff5a97d03 --- /dev/null +++ b/pkgs/development/python-modules/pyunpack/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, easyprocess +, entrypoint2 +, patool +}: + +buildPythonPackage rec { + pname = "pyunpack"; + version = "0.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "ponty"; + repo = "pyunpack"; + rev = "refs/tags/${version}"; + hash = "sha256-1MAdiX6+u35f6S8a0ZcIIebZE8bbxTy+0TnMohJ7J6s="; + }; + + postPatch = '' + substituteInPlace pyunpack/__init__.py \ + --replace \ + '_exepath("patool")' \ + '"${patool}/bin/.patool-wrapped"' + ''; + + propagatedBuildInputs = [ + easyprocess + entrypoint2 + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "-x" ]; + + pythonImportsCheck = [ "pyunpack" ]; + + disabledTestPaths = [ + # unfree + "tests/test_rar.py" + + # We get "patool: error: unrecognized arguments: --password 123" + # The currently packaged version of patool does not support this flag. + # https://github.com/wummel/patool/issues/114 + # FIXME: Re-enable these once patool is updated + "tests/test_rarpw.py" + "tests/test_zippw.py" + ]; + + meta = with lib; { + description = "Unpack archive files in python"; + homepage = "https://github.com/ponty/pyunpack"; + license = licenses.bsd2; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88286da2d169..e052bf5411d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8193,6 +8193,8 @@ self: super: with self; { pyuca = callPackage ../development/python-modules/pyuca { }; + pyunpack = callPackage ../development/python-modules/pyunpack { }; + pyutil = callPackage ../development/python-modules/pyutil { }; pyzbar = callPackage ../development/python-modules/pyzbar { }; From 21a3163cc44aea29be2e51c68354a85106e8cfb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 18:49:52 +0000 Subject: [PATCH 37/81] python310Packages.rzpipe: 0.5.1 -> 0.6.0 --- pkgs/development/python-modules/rzpipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rzpipe/default.nix b/pkgs/development/python-modules/rzpipe/default.nix index b2f31e85f54a..9266a1dec7fc 100644 --- a/pkgs/development/python-modules/rzpipe/default.nix +++ b/pkgs/development/python-modules/rzpipe/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "rzpipe"; - version = "0.5.1"; + version = "0.6.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-0xbkdgMDiBwSzXmlVmRwHlLBgVmfZgmM8lQ4ALgmaBk="; + hash = "sha256-py4oiNp+WUcOGHn2AdHyIpgV8BsI8A1gtJi2joi1Wxc="; }; # No native rz_core library From 9ebbac3799c9854ed1bf526ad2196b095b39d864 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Aug 2023 21:51:40 +0200 Subject: [PATCH 38/81] python310Packages.rzpipe: add changelog to meta --- pkgs/development/python-modules/rzpipe/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/rzpipe/default.nix b/pkgs/development/python-modules/rzpipe/default.nix index 9266a1dec7fc..4960c7894030 100644 --- a/pkgs/development/python-modules/rzpipe/default.nix +++ b/pkgs/development/python-modules/rzpipe/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface for rizin"; homepage = "https://rizin.re"; + changelog = "https://github.com/rizinorg/rizin/releases/tag/v0.6.0"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 525544aa4436d103381287f1c81d18c25fc16fa4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Aug 2023 21:53:35 +0200 Subject: [PATCH 39/81] python310Packages.rzpipe: add format --- pkgs/development/python-modules/rzpipe/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/rzpipe/default.nix b/pkgs/development/python-modules/rzpipe/default.nix index 4960c7894030..3e831ef3e44e 100644 --- a/pkgs/development/python-modules/rzpipe/default.nix +++ b/pkgs/development/python-modules/rzpipe/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "rzpipe"; version = "0.6.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; From 8af49f9fbd6031b9cff0ef4c237ca72e5e73f7f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Aug 2023 21:54:20 +0200 Subject: [PATCH 40/81] python310Packages.rzpipe: adjust changelog entry --- pkgs/development/python-modules/rzpipe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/rzpipe/default.nix b/pkgs/development/python-modules/rzpipe/default.nix index 3e831ef3e44e..d5a98e0c63bb 100644 --- a/pkgs/development/python-modules/rzpipe/default.nix +++ b/pkgs/development/python-modules/rzpipe/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface for rizin"; homepage = "https://rizin.re"; - changelog = "https://github.com/rizinorg/rizin/releases/tag/v0.6.0"; + changelog = "https://github.com/rizinorg/rizin/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From ad7aae4be4116117ae85985fc86b7b1ec160115a Mon Sep 17 00:00:00 2001 From: icyrockcom Date: Wed, 9 Aug 2023 15:56:10 -0400 Subject: [PATCH 41/81] python3Packages.polars: 0.18.0 -> 0.18.13 --- .../python-modules/polars/Cargo.lock | 757 +++++++++--------- .../python-modules/polars/default.nix | 6 +- 2 files changed, 379 insertions(+), 384 deletions(-) diff --git a/pkgs/development/python-modules/polars/Cargo.lock b/pkgs/development/python-modules/polars/Cargo.lock index cb2615304449..0ea668d6b7c8 100644 --- a/pkgs/development/python-modules/polars/Cargo.lock +++ b/pkgs/development/python-modules/polars/Cargo.lock @@ -2,6 +2,15 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" @@ -28,9 +37,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] @@ -50,6 +59,18 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -86,9 +107,8 @@ dependencies = [ [[package]] name = "arrow2" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15ae0428d69ab31d7b2adad22a752d6f11fef2e901d2262d0cad4f5cb08b7093" +version = "0.17.3" +source = "git+https://github.com/jorgecarleitao/arrow2?rev=2ecd3e823f63884ca77b146a8cd8fcdea9f328fd#2ecd3e823f63884ca77b146a8cd8fcdea9f328fd" dependencies = [ "ahash", "arrow-format", @@ -138,18 +158,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.27", ] [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.27", ] [[package]] @@ -182,10 +202,25 @@ dependencies = [ ] [[package]] -name = "base64" -version = "0.21.1" +name = "backtrace" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bitflags" @@ -216,9 +251,9 @@ dependencies = [ [[package]] name = "built" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96f9cdd34d6eb553f9ea20e5bf84abb7b13c729f113fc1d8e49dc00ad9fa8738" +checksum = "b99c4cdc7b2c2364182331055623bdf45254fcb679fea565c40c3c11c101889a" dependencies = [ "cargo-lock", "chrono", @@ -248,7 +283,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.27", ] [[package]] @@ -259,9 +294,9 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cargo-lock" -version = "8.0.3" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996" +checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" dependencies = [ "semver", "serde", @@ -286,13 +321,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", "time", @@ -302,9 +337,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9cc2b23599e6d7479755f3594285efb3f74a1bdca7a7374948bc831e23a552" +checksum = "f1369bc6b9e9a7dfdae2055f6ec151fe9c554a9d23d357c0237cee2e25eaabb7" dependencies = [ "chrono", "chrono-tz-build", @@ -313,9 +348,9 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9998fb9f7e9b2111641485bf8beb32f92945f97f92a3d061f744cfef335f751" +checksum = "e2f5ebdc942f57ed96d560a6d1a459bae5851102a25d5bf89dc04ae453e31ecf" dependencies = [ "parse-zoneinfo", "phf", @@ -351,13 +386,13 @@ dependencies = [ [[package]] name = "comfy-table" -version = "6.1.4" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e7b787b0dc42e8111badfdbe4c3059158ccb2db8780352fa1b01e8ccf45cc4d" +checksum = "9ab77dbd8adecaf3f0db40581631b995f312a8a5ae3aa9993188bb8f23d83a5b" dependencies = [ "crossterm", "strum", - "strum_macros", + "strum_macros 0.24.3", "unicode-width", ] @@ -414,9 +449,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -437,24 +472,24 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] [[package]] name = "crossterm" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" dependencies = [ "bitflags", "crossterm_winapi", "libc", "mio", - "parking_lot 0.12.1", + "parking_lot", "signal-hook", "signal-hook-mio", "winapi", @@ -462,37 +497,43 @@ dependencies = [ [[package]] name = "crossterm_winapi" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" dependencies = [ "winapi", ] [[package]] name = "dyn-clone" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "enum_dispatch" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" +checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.27", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "ethnum" version = "1.3.2" @@ -538,9 +579,9 @@ checksum = "ee1b05cbd864bcaecbd3455d6d967862d446e4ebfc3c2e5e5b9841e53cba6673" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -601,7 +642,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.27", ] [[package]] @@ -636,9 +677,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -648,21 +689,16 @@ dependencies = [ ] [[package]] -name = "ghost" -version = "0.1.9" +name = "gimli" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.16", -] +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "git2" -version = "0.16.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" +checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ "bitflags", "libc", @@ -685,9 +721,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "halfbrown" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f985624e90f861184145c13b736873a0f83cdb998a292dbb0653598ab03aecbf" +checksum = "5681137554ddff44396e5f149892c769d45301dd9aa19c51602a89ee214cb0ec" dependencies = [ "hashbrown 0.13.2", "serde", @@ -699,12 +735,6 @@ version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74721d007512d0cb3338cd20f0654ac913920061a4c4d0d8708edb3f2a698c0c" -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.13.2" @@ -712,6 +742,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash", + "allocator-api2", "rayon", ] @@ -723,12 +763,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -742,14 +779,14 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -770,9 +807,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -780,12 +817,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ - "autocfg", - "hashbrown 0.12.3", + "equivalent", + "hashbrown 0.14.0", "serde", ] @@ -795,29 +832,17 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - [[package]] name = "inventory" -version = "0.3.6" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0539b5de9241582ce6bd6b0ba7399313560151e58c9aaf8b74b711b1bdce644" -dependencies = [ - "ghost", -] +checksum = "a53088c87cf71c9d4f3372a2cb9eea1e7b8a0b1bf8b7f7d23fe5b76dbb07e63b" [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "itoap" @@ -856,9 +881,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -948,9 +973,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.144" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libflate" @@ -974,9 +999,9 @@ dependencies = [ [[package]] name = "libgit2-sys" -version = "0.14.2+1.5.1" +version = "0.15.2+1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" dependencies = [ "cc", "libc", @@ -1002,9 +1027,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -1014,9 +1039,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -1024,12 +1049,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "lz4" @@ -1078,9 +1100,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -1105,14 +1127,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] @@ -1189,9 +1211,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", "libm", @@ -1199,9 +1221,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ "hermit-abi", "libc", @@ -1209,9 +1231,9 @@ dependencies = [ [[package]] name = "numpy" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b0fee4571867d318651c24f4a570c3f18408cf95f16ccb576b3ce85496a46e" +checksum = "437213adf41bbccf4aeae535fbfcdad0f6fed241e1ae182ebe97fa1f3ce19389" dependencies = [ "libc", "ndarray", @@ -1223,21 +1245,19 @@ dependencies = [ ] [[package]] -name = "once_cell" -version = "1.17.1" +name = "object" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] [[package]] -name = "parking_lot" -version = "0.11.2" +name = "once_cell" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "parking_lot" @@ -1246,34 +1266,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", + "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.6" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys 0.45.0", + "windows-targets", ] [[package]] @@ -1315,24 +1321,24 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_shared", ] [[package]] name = "phf_codegen" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", "phf_shared", @@ -1340,9 +1346,9 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ "phf_shared", "rand", @@ -1350,18 +1356,18 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -1386,7 +1392,7 @@ dependencies = [ [[package]] name = "polars" -version = "0.30.0" +version = "0.31.1" dependencies = [ "getrandom", "polars-core", @@ -1400,7 +1406,7 @@ dependencies = [ [[package]] name = "polars-algo" -version = "0.30.0" +version = "0.31.1" dependencies = [ "polars-core", "polars-lazy", @@ -1409,23 +1415,25 @@ dependencies = [ [[package]] name = "polars-arrow" -version = "0.30.0" +version = "0.31.1" dependencies = [ "arrow2", "atoi", "chrono", "chrono-tz", - "hashbrown 0.13.2", + "ethnum", + "hashbrown 0.14.0", "multiversion", "num-traits", "polars-error", "serde", "thiserror", + "version_check", ] [[package]] name = "polars-core" -version = "0.30.0" +version = "0.31.1" dependencies = [ "ahash", "arrow2", @@ -1434,7 +1442,7 @@ dependencies = [ "chrono-tz", "comfy-table", "either", - "hashbrown 0.13.2", + "hashbrown 0.14.0", "indexmap", "itoap", "ndarray", @@ -1452,13 +1460,13 @@ dependencies = [ "serde_json", "smartstring", "thiserror", - "wasm-timer", + "version_check", "xxhash-rust", ] [[package]] name = "polars-error" -version = "0.30.0" +version = "0.31.1" dependencies = [ "arrow2", "regex", @@ -1467,7 +1475,7 @@ dependencies = [ [[package]] name = "polars-io" -version = "0.30.0" +version = "0.31.1" dependencies = [ "ahash", "arrow2", @@ -1502,12 +1510,12 @@ dependencies = [ [[package]] name = "polars-json" -version = "0.30.0" +version = "0.31.1" dependencies = [ "ahash", "arrow2", "fallible-streaming-iterator", - "hashbrown 0.13.2", + "hashbrown 0.14.0", "indexmap", "num-traits", "polars-arrow", @@ -1518,7 +1526,7 @@ dependencies = [ [[package]] name = "polars-lazy" -version = "0.30.0" +version = "0.31.1" dependencies = [ "ahash", "bitflags", @@ -1536,17 +1544,21 @@ dependencies = [ "pyo3", "rayon", "smartstring", + "version_check", ] [[package]] name = "polars-ops" -version = "0.30.0" +version = "0.31.1" dependencies = [ "argminmax", "arrow2", "base64", + "chrono", + "chrono-tz", "either", "hex", + "indexmap", "jsonpath_lib", "memchr", "polars-arrow", @@ -1556,16 +1568,17 @@ dependencies = [ "serde", "serde_json", "smartstring", + "version_check", ] [[package]] name = "polars-pipe" -version = "0.30.0" +version = "0.31.1" dependencies = [ "crossbeam-channel", "crossbeam-queue", "enum_dispatch", - "hashbrown 0.13.2", + "hashbrown 0.14.0", "num-traits", "polars-arrow", "polars-core", @@ -1576,16 +1589,18 @@ dependencies = [ "polars-utils", "rayon", "smartstring", + "version_check", ] [[package]] name = "polars-plan" -version = "0.30.0" +version = "0.31.1" dependencies = [ "ahash", "arrow2", "chrono", "chrono-tz", + "ciborium", "once_cell", "polars-arrow", "polars-core", @@ -1598,11 +1613,13 @@ dependencies = [ "regex", "serde", "smartstring", + "strum_macros 0.25.1", + "version_check", ] [[package]] name = "polars-row" -version = "0.30.0" +version = "0.31.1" dependencies = [ "arrow2", "polars-error", @@ -1611,7 +1628,7 @@ dependencies = [ [[package]] name = "polars-sql" -version = "0.30.0" +version = "0.31.1" dependencies = [ "polars-arrow", "polars-core", @@ -1624,7 +1641,7 @@ dependencies = [ [[package]] name = "polars-time" -version = "0.30.0" +version = "0.31.1" dependencies = [ "arrow2", "atoi", @@ -1643,14 +1660,17 @@ dependencies = [ [[package]] name = "polars-utils" -version = "0.30.0" +version = "0.31.1" dependencies = [ "ahash", - "hashbrown 0.13.2", + "hashbrown 0.14.0", + "num-traits", "once_cell", + "polars-error", "rayon", "smartstring", "sysinfo", + "version_check", ] [[package]] @@ -1661,20 +1681,21 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.58" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "py-polars" -version = "0.18.0" +version = "0.18.13" dependencies = [ "ahash", "built", "ciborium", + "either", "jemallocator", "lexical-core", "libc", @@ -1685,6 +1706,7 @@ dependencies = [ "polars", "polars-algo", "polars-core", + "polars-error", "polars-lazy", "pyo3", "pyo3-built", @@ -1695,16 +1717,16 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.18.3" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b1ac5b3731ba34fdaa9785f8d74d17448cd18f30cf19e0c7e7b1fdb5272109" +checksum = "ffb88ae05f306b4bfcde40ac4a51dc0b05936a9207a4b75b798c7729c4258a59" dependencies = [ "cfg-if", "indoc", "inventory", "libc", "memoffset", - "parking_lot 0.12.1", + "parking_lot", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", @@ -1713,9 +1735,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.18.3" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cb946f5ac61bb61a5014924910d936ebd2b23b705f7a4a3c40b05c720b079a3" +checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0" dependencies = [ "once_cell", "target-lexicon", @@ -1729,9 +1751,9 @@ checksum = "be6d574e0f8cab2cdd1eeeb640cbf845c974519fa9e9b62fa9c08ecece0ca5de" [[package]] name = "pyo3-ffi" -version = "0.18.3" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4d7c5337821916ea2a1d21d1092e8443cf34879e53a0ac653fbb98f44ff65c" +checksum = "922ede8759e8600ad4da3195ae41259654b9c55da4f7eec84a0ccc7d067a70a4" dependencies = [ "libc", "pyo3-build-config", @@ -1739,9 +1761,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.18.3" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d39c55dab3fc5a4b25bbd1ac10a2da452c4aca13bb450f22818a002e29648d" +checksum = "8a5caec6a1dd355964a841fcbeeb1b89fe4146c87295573f94228911af3cc5a2" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -1751,9 +1773,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.18.3" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97daff08a4c48320587b5224cc98d609e3c27b6d437315bd40b605c98eeb5918" +checksum = "e0b78ccbb160db1556cdb6fd96c50334c5d4ec44dc5e0a968d0a1208fa0efa8b" dependencies = [ "proc-macro2", "quote", @@ -1762,9 +1784,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.27" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -1839,22 +1861,34 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.8.2" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata", + "regex-syntax 0.7.4", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", ] [[package]] @@ -1865,9 +1899,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rle-decode-fast" @@ -1875,6 +1909,12 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + [[package]] name = "rustc-hash" version = "1.1.0" @@ -1892,62 +1932,62 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] [[package]] name = "seq-macro" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b44e8fc93a14e66336d230954dda83d18b4605ccace8fe09bc7514a71ad0bc" +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.27", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "indexmap", "itoa", @@ -1956,10 +1996,19 @@ dependencies = [ ] [[package]] -name = "signal-hook" -version = "0.3.15" +name = "serde_spanned" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -1987,9 +2036,8 @@ dependencies = [ [[package]] name = "simd-json" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b001e6c10fcba79ac15990241d37c3f8c6ba4f9a14ee35fcebc0c067514b83a" +version = "0.10.0" +source = "git+https://github.com/ritchie46/simd-json?branch=initialize#946b316f686c6ad3050f694ea434248c38aa321d" dependencies = [ "ahash", "halfbrown", @@ -2024,9 +2072,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "smartstring" @@ -2111,6 +2159,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "strum_macros" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.27", +] + [[package]] name = "syn" version = "1.0.109" @@ -2124,9 +2185,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", @@ -2135,9 +2196,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.0" +version = "0.29.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f1dc6930a439cc5d154221b5387d153f8183529b07c19aca24ea31e0a167e1" +checksum = "165d6d8539689e3d3bc8b98ac59541e1f21c7de7c85d60dc80e43ae0ed2113db" dependencies = [ "cfg-if", "core-foundation-sys", @@ -2155,28 +2216,28 @@ checksum = "06f6b473c37f9add4cf1df5b4d66a8ef58ab6c895f1a3b3f949cf3e21230140e" [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.27", ] [[package]] @@ -2207,25 +2268,51 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.1" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ "autocfg", + "backtrace", "libc", "mio", "pin-project-lite", "socket2", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "toml" -version = "0.5.11" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", ] [[package]] @@ -2236,9 +2323,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -2263,9 +2350,9 @@ checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -2310,9 +2397,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2320,36 +2407,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.27", "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2357,47 +2432,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.27", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" - -[[package]] -name = "wasm-timer" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" -dependencies = [ - "futures", - "js-sys", - "parking_lot 0.11.2", - "pin-utils", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" -dependencies = [ - "js-sys", - "wasm-bindgen", -] +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "winapi" @@ -2427,16 +2477,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", + "windows-targets", ] [[package]] @@ -2445,123 +2486,75 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" 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", + "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-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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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 = "winnow" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11" +dependencies = [ + "memchr", +] + [[package]] name = "xxhash-rust" version = "0.8.6" @@ -2570,18 +2563,18 @@ checksum = "735a71d46c4d68d71d4b24d03fdc2b98e38cea81730595801db779c04fe80d70" [[package]] name = "zstd" -version = "0.12.3+zstd.1.5.2" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "6.0.5+zstd.1.5.4" +version = "6.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" +checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" dependencies = [ "libc", "zstd-sys", diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index 49d23e2d07e0..b070ae37978f 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -10,12 +10,12 @@ }: let pname = "polars"; - version = "0.18.0"; # Can't update to >0.18.0 until we get rust 1.71 + version = "0.18.13"; rootSource = fetchFromGitHub { owner = "pola-rs"; repo = "polars"; rev = "refs/tags/py-${version}"; - hash = "sha256-uzo8KPEegaVuzrfKUmsHheQfmm9hVMgkNJMWdfqDrw8="; + hash = "sha256-kV30r2wmswpCUmMRaFsCOeRrlTN5/PU0ogaU2JIHq0E="; }; in buildPythonPackage { @@ -35,7 +35,9 @@ buildPythonPackage { cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { + "arrow2-0.17.3" = "sha256-pM6lNjMCpUzC98IABY+M23lbLj0KMXDefgBMjUPjDlg="; "jsonpath_lib-0.3.0" = "sha256-NKszYpDGG8VxfZSMbsTlzcMGFHBOUeFojNw4P2wM3qk="; + "simd-json-0.10.0" = "sha256-0q/GhL7PG5SLgL0EETPqe8kn6dcaqtyL+kLU9LL+iQs="; }; }; cargoRoot = "py-polars"; From 262fe5d026534ac3510dbebad1b539b4e62df799 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Aug 2023 21:57:40 +0200 Subject: [PATCH 42/81] python310Packages.pyintesishome: add changelog to meta --- pkgs/development/python-modules/pyintesishome/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyintesishome/default.nix b/pkgs/development/python-modules/pyintesishome/default.nix index b0dea8b49bfd..11a9c3661534 100644 --- a/pkgs/development/python-modules/pyintesishome/default.nix +++ b/pkgs/development/python-modules/pyintesishome/default.nix @@ -21,11 +21,15 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "pyintesishome" ]; + + pythonImportsCheck = [ + "pyintesishome" + ]; meta = with lib; { description = "Python interface for IntesisHome devices"; homepage = "https://github.com/jnimmo/pyIntesisHome"; + changelog = "https://github.com/jnimmo/pyIntesisHome/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 9c8a3968561c1f81a31032086b3c6546c6bd308a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Aug 2023 21:58:32 +0200 Subject: [PATCH 43/81] python310Packages.pyintesishome: add format - disable on unsupported Python releases --- pkgs/development/python-modules/pyintesishome/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pyintesishome/default.nix b/pkgs/development/python-modules/pyintesishome/default.nix index 11a9c3661534..6d53d7bc2eb5 100644 --- a/pkgs/development/python-modules/pyintesishome/default.nix +++ b/pkgs/development/python-modules/pyintesishome/default.nix @@ -2,11 +2,15 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { pname = "pyintesishome"; version = "1.8.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jnimmo"; From a69648b581d1e089cdb80f6e30dae6b79c2bc5f7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 9 Aug 2023 16:46:12 -0400 Subject: [PATCH 44/81] egglog: unstable-2023-07-19 -> unstable-2023-08-09 Diff: https://github.com/egraphs-good/egglog/compare/9fe03ad35a2a975a2c9140a641ba91266b7a72ce...de31786679e3fa879e37c324e7eb54d76466f61f --- pkgs/applications/science/logic/egglog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/egglog/default.nix b/pkgs/applications/science/logic/egglog/default.nix index 65dbcd5a1b43..b976cc3462f3 100644 --- a/pkgs/applications/science/logic/egglog/default.nix +++ b/pkgs/applications/science/logic/egglog/default.nix @@ -5,13 +5,13 @@ rustPlatform.buildRustPackage { pname = "egglog"; - version = "unstable-2023-07-19"; + version = "unstable-2023-08-09"; src = fetchFromGitHub { owner = "egraphs-good"; repo = "egglog"; - rev = "9fe03ad35a2a975a2c9140a641ba91266b7a72ce"; - hash = "sha256-9JeJJdZW8ecogReJzQrp3hFkK/pp/+pLxJMNREWuiyI="; + rev = "de31786679e3fa879e37c324e7eb54d76466f61f"; + hash = "sha256-mskFjDTkmHwaGWMpwW2DTD64vLvWGZJYgy9smEbhFwI="; }; cargoLock = { From b2ac1c2b81de433932538a3abee653a90d7393dc Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 9 Aug 2023 09:43:09 -0400 Subject: [PATCH 45/81] python310Packages.bitsandbytes: 0.38.0 -> 0.41.0 --- .../python-modules/bitsandbytes/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix index d63b79a1e20b..1bd32dab6741 100644 --- a/pkgs/development/python-modules/bitsandbytes/default.nix +++ b/pkgs/development/python-modules/bitsandbytes/default.nix @@ -5,6 +5,7 @@ , pythonOlder , pytestCheckHook , setuptools +, wheel , torch , einops , lion-pytorch @@ -14,7 +15,7 @@ let pname = "bitsandbytes"; - version = "0.38.0"; + version = "0.41.0"; inherit (torch) cudaCapabilities cudaPackages cudaSupport; inherit (cudaPackages) backendStdenv cudaVersion; @@ -53,14 +54,14 @@ buildPythonPackage { owner = "TimDettmers"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gGlbzTDvZNo4MhcYzLvWuB2ec7q+Qt5/LtTbJ0Rc+Kk="; + hash = "sha256-e6SK2ylITookO6bhpfdRp/V4y2S9rk6Lo1PD3xXrcmM="; }; postPatch = '' substituteInPlace Makefile --replace "/usr/bin/g++" "g++" --replace "lib64" "lib" substituteInPlace bitsandbytes/cuda_setup/main.py \ - --replace "binary_path = package_dir / binary_name" \ - "binary_path = Path('$out/${python.sitePackages}/${pname}')/binary_name" + --replace "binary_path = package_dir / self.binary_name" \ + "binary_path = Path('$out/${python.sitePackages}/${pname}')/self.binary_name" '' + lib.optionalString torch.cudaSupport '' substituteInPlace bitsandbytes/cuda_setup/main.py \ --replace "/usr/local/cuda/lib64" "${cuda-native-redist}/lib" @@ -75,15 +76,16 @@ buildPythonPackage { else ''make CUDA_VERSION=CPU cpuonly''; - nativeBuildInputs = [ setuptools ] ++ lib.optionals torch.cudaSupport [ cuda-native-redist ]; + nativeBuildInputs = [ setuptools wheel ] ++ lib.optionals torch.cudaSupport [ cuda-native-redist ]; buildInputs = lib.optionals torch.cudaSupport [ cuda-redist ]; propagatedBuildInputs = [ + scipy torch ]; doCheck = false; # tests require CUDA and also GPU access - nativeCheckInputs = [ pytestCheckHook einops lion-pytorch scipy ]; + nativeCheckInputs = [ pytestCheckHook einops lion-pytorch ]; pythonImportsCheck = [ "bitsandbytes" From f8438ab7019c6fcc6723ed232ce84e921fd6967c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 9 Aug 2023 23:21:37 +0200 Subject: [PATCH 46/81] sozu: update platforms --- pkgs/servers/sozu/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index 583e1da3678e..fbf11cacbec0 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -45,6 +45,7 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/sozu-proxy/sozu/releases/tag/${version}"; license = licenses.agpl3; maintainers = with maintainers; [ Br1ght0ne gaelreyrol ]; - platforms = [ "x86_64-linux" ]; + # error[E0432]: unresolved import `std::arch::x86_64` + broken = !stdenv.isx86_64; }; } From bf91143e2f4b5cac0452130ec51c975ab53ed60a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 21:52:41 +0000 Subject: [PATCH 47/81] roxctl: 4.1.0 -> 4.1.2 --- pkgs/applications/networking/cluster/roxctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index 928a6509333b..bfd8c740fa79 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "4.1.0"; + version = "4.1.2"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-9Y+NvKJ6+lzLaIIEgpY5zwiKd+mb9sbOcS5rsH2yB8g="; + sha256 = "sha256-5wNf80kiYnKg/urIQQqe4HijqxQweiFx0UktFiOTeaU="; }; - vendorHash = "sha256-lZwj8Ne6/XYkmjYhytT75DyJWwweuX0x88VsGdKTMac="; + vendorHash = "sha256-5glD904guK+TR9YFzeuIyHOXrJblcEVi9EReQz0fCCA="; nativeBuildInputs = [ installShellFiles ]; From dcfccf1221cca677ca02a7ac1d48f36dd93df01a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Aug 2023 23:58:51 +0200 Subject: [PATCH 48/81] checkov: 2.3.359 -> 2.3.360 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.3.359...2.3.360 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.3.360 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 2f299463c55a..1df7e59abc8e 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.359"; + version = "2.3.360"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9Ai8nsPy5BlyeVoEcZeMr+UlUp7kv7wxS9xn9wrvAJo="; + hash = "sha256-3EyaJiApKm2Kaj1nAfadMyn/qnrx3on2rYQAXc6jG8E="; }; patches = [ From 32225a2638c0efcd7c5951330d56c1ae78897ea4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 22:10:32 +0000 Subject: [PATCH 49/81] gopass: 1.15.6 -> 1.15.7 --- pkgs/tools/security/gopass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 87ea59122bbc..93b4ff4119b3 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.15.6"; + version = "1.15.7"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = "gopass"; rev = "v${version}"; - hash = "sha256-qhnkU2LuwUWP3Fi/XekFJp3WujeRxF/UHVBiVTfbxJ4="; + hash = "sha256-Q3EX5giteIsH5+fXb7n2qpd9kBjaZZ/A5VuCljc72C8="; }; - vendorHash = "sha256-FZFN+xy23osgFs7Cm3S+LwKaE9Y94qcDVgv+CxA8J68="; + vendorHash = "sha256-crnr5qXlYrhNT3nLlA7U13CaYAmAqcV+MBs/hee9ixU="; subPackages = [ "." ]; From 73aa1ca9c29917f6532af64304714f803f87549a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 9 Aug 2023 22:11:00 +0000 Subject: [PATCH 50/81] git-credential-gopass: 1.15.5 -> 1.15.7 Diff: https://github.com/gopasspw/git-credential-gopass/compare/v1.15.5...v1.15.7 Changelog: https://github.com/gopasspw/git-credential-gopass/blob/v1.15.7/CHANGELOG.md --- pkgs/tools/security/gopass/git-credential.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index d3ba15f37089..eb3c2c9b96c9 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "git-credential-gopass"; - version = "1.15.5"; + version = "1.15.7"; src = fetchFromGitHub { owner = "gopasspw"; repo = "git-credential-gopass"; rev = "v${version}"; - hash = "sha256-jjW+mqGklnQsX+nznEeehrIMoJ3MX1H5aF7LAePY2g0="; + hash = "sha256-O8lqrvaFfcFHevZpRf+VbIQCBQUuc+B34OmQ3/VIOzI="; }; - vendorHash = "sha256-BXzXpG1Dy25IBf8EzgzOnFcbEvQGVhO8jgR/t6IKgPw="; + vendorHash = "sha256-gb9AZBh5oUAiuCXbsvkmYxcHRNd9KLYq35nMd4iabKw="; subPackages = [ "." ]; @@ -34,6 +34,7 @@ buildGoModule rec { meta = with lib; { description = "Manage git credentials using gopass"; homepage = "https://github.com/gopasspw/git-credential-gopass"; + changelog = "https://github.com/gopasspw/git-credential-gopass/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ benneti ]; }; From 614c2be7a217627015d15718738d9a06af85af56 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 9 Aug 2023 22:11:00 +0000 Subject: [PATCH 51/81] gopass-hibp: 1.15.5 -> 1.15.7 Diff: https://github.com/gopasspw/gopass-hibp/compare/v1.15.5...v1.15.7 Changelog: https://github.com/gopasspw/gopass-hibp/blob/v1.15.7/CHANGELOG.md --- pkgs/tools/security/gopass/hibp.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix index b341d0aa67a5..1486f8476f2b 100644 --- a/pkgs/tools/security/gopass/hibp.nix +++ b/pkgs/tools/security/gopass/hibp.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-hibp"; - version = "1.15.5"; + version = "1.15.7"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-hibp"; rev = "v${version}"; - hash = "sha256-BHMhQqaYM0WfCzvDo7X1GEVNv44zEw2KeA9jhF7RgC4="; + hash = "sha256-525e2LXQ/Ldrqhxqndwpdo2HeS4xRkbPzfwvWeiEayE="; }; - vendorHash = "sha256-Y6BMzSRzbORIbebfP+ptIswyOclM1bs1zPmLpqko//4="; + vendorHash = "sha256-jfqxl21euOtOvt+RltVlSjca2o8VuLtWHgpnW4ve5JM="; subPackages = [ "." ]; @@ -33,7 +33,8 @@ buildGoModule rec { meta = with lib; { description = "Gopass haveibeenpwnd.com integration"; - homepage = "https://www.gopass.pw/"; + homepage = "https://github.com/gopasspw/gopass-hibp"; + changelog = "https://github.com/gopasspw/gopass-hibp/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; }; From 4ff2823dbf986d60c7b788bd5e50060917669c0c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 9 Aug 2023 22:11:00 +0000 Subject: [PATCH 52/81] gopass-jsonapi: 1.15.5 -> 1.15.7 Diff: https://github.com/gopasspw/gopass-jsonapi/compare/v1.15.5...v1.15.7 Changelog: https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.7/CHANGELOG.md --- pkgs/tools/security/gopass/jsonapi.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index 6617a43e7f21..f7c0cd0ebdf9 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.15.5"; + version = "1.15.7"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-jsonapi"; rev = "v${version}"; - hash = "sha256-ZSX5g1agmnPU8Nlmptr3GVrjtPPKbDxouSjz9ulSW44="; + hash = "sha256-lwY5uc6eKqXO8FbvzlrpQY0y5AEcV0RQFvvnE+At6z0="; }; - vendorHash = "sha256-JWOBGTJFzihoznYFzcgjayAzNof6Ob5u3Jfx2a6zwEk="; + vendorHash = "sha256-BKwgP22l4t4jaAHHh+ZD/2nroCtAp/A6DqHt+9HZzKw="; subPackages = [ "." ]; @@ -34,7 +34,8 @@ buildGoModule rec { meta = with lib; { description = "Enables communication with gopass via JSON messages"; - homepage = "https://www.gopass.pw/"; + homepage = "https://github.com/gopasspw/gopass-jsonapi"; + changelog = "https://github.com/gopasspw/gopass-jsonapi/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxhbr ]; }; From 6dd19a7267254477fdc5340b8623e3b618e23532 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 9 Aug 2023 22:11:00 +0000 Subject: [PATCH 53/81] gopass-summon-provider: 1.15.5 -> 1.15.7 Diff: https://github.com/gopasspw/gopass-summon-provider/compare/v1.15.5...v1.15.7 Changelog: https://github.com/gopasspw/gopass-summon-provider/blob/v1.15.7/CHANGELOG.md --- pkgs/tools/security/gopass/summon.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix index 8001fa09ac67..eb264b752d08 100644 --- a/pkgs/tools/security/gopass/summon.nix +++ b/pkgs/tools/security/gopass/summon.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-summon-provider"; - version = "1.15.5"; + version = "1.15.7"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-summon-provider"; rev = "v${version}"; - hash = "sha256-ZAXdazhRqg9TbWWbftz9og3H7LTHenLlpFPIgZQHd/Q="; + hash = "sha256-JoSNWgwTnFQbnrwGIk6L5SwQeNg0RfLMULceqFF/XnA="; }; - vendorHash = "sha256-BXzXpG1Dy25IBf8EzgzOnFcbEvQGVhO8jgR/t6IKgPw="; + vendorHash = "sha256-gb9AZBh5oUAiuCXbsvkmYxcHRNd9KLYq35nMd4iabKw="; subPackages = [ "." ]; @@ -33,7 +33,8 @@ buildGoModule rec { meta = with lib; { description = "Gopass Summon Provider"; - homepage = "https://www.gopass.pw/"; + homepage = "https://github.com/gopasspw/gopass-summon-provider"; + changelog = "https://github.com/gopasspw/gopass-summon-provider/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; }; From 13e897eb3b64e9d7671221356ba643df88d05e6b Mon Sep 17 00:00:00 2001 From: Frothy <76622149+FrothyMarrow@users.noreply.github.com> Date: Wed, 9 Aug 2023 18:11:35 -0400 Subject: [PATCH 54/81] spicetify-cli: 2.22.1 -> 2.22.2 --- pkgs/applications/misc/spicetify-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 3f77420a5634..e30bce8b3754 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.22.1"; + version = "2.22.2"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-EbTmxnUk2taAKWPNuoVcKybKgdvPegFjz/ImTIabZ7Q="; + hash = "sha256-86ktRfBY7q83KGrc/JF1gIcIJxuScqIr27QPcl1U8vc="; }; - vendorHash = "sha256-Ypu3AKnjh2lDh43t1GZMJo7ZyEDyNbPWvoePLp+WQdI="; + vendorHash = "sha256-+3PeugLSpybbjNSyFMWBGBX6QDaM41eH0ifPO39YfA0="; ldflags = [ "-s -w" From 1bf35f9327d5fa752583b3fe9c602199926a6d0f Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 9 Aug 2023 19:21:18 -0400 Subject: [PATCH 55/81] erg: 0.6.17 -> 0.6.18 Diff: https://github.com/erg-lang/erg/compare/v0.6.17...v0.6.18 Changelog: https://github.com/erg-lang/erg/releases/tag/v0.6.18 --- pkgs/development/compilers/erg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix index 8706c05febcd..a3ed2397c8eb 100644 --- a/pkgs/development/compilers/erg/default.nix +++ b/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.17"; + version = "0.6.18"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-KHfKV0i3jYwzD/PQ0TSOlxjUnc08pk0yKrLQlg5eQvg="; + hash = "sha256-bpKzC7xHP4vfl2WcyMEsFK1aAbkP3dtlpyNvXUWHWKg="; }; - cargoHash = "sha256-PD1C3IsupjyQndD971zbfHYxizOQd/t770u48o/aGmk="; + cargoHash = "sha256-wIp+zQpHLmZNwgbSXQKV45YwO5qpZqdcUE6gnF/Wzhk="; nativeBuildInputs = [ makeWrapper From 4c07af8f4c2e86be0e3abdf0750380d165790471 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Aug 2023 01:40:08 +0200 Subject: [PATCH 56/81] chrony: 4.3 -> 4.4 --- pkgs/tools/networking/chrony/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 2b1bee85bcff..c85c6d9febf4 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "chrony"; - version = "4.3"; + version = "4.4"; src = fetchurl { url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz"; - hash = "sha256-nQ2oiahl8ImlohYQ/7ZxPjyUOM4wOmO0nC+26v9biAQ="; + hash = "sha256-6vsH5tr5KxQiAPR4hW3+1u/J6i0Ubu3tXtywm5MScIg="; }; outputs = [ "out" "man" ]; From 5143a50a545d6fbc26f2e64e4f89f8132b30321b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 23:52:09 +0000 Subject: [PATCH 57/81] terragrunt: 0.48.4 -> 0.48.6 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 274cd0ce3691..940d6bf2afbe 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.48.4"; + version = "0.48.6"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3hHCNiuff8CgnQ6hB4I8jODINKA6ZpNOkKwVcCqKDo4="; + hash = "sha256-pvDZfKITFrhtLnewAhRGjwu45zj2q3usNSr9U2xb52Y="; }; vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA="; From fdab18b7b470ec6331b24a5bd8782aab22c34886 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Aug 2023 00:04:03 +0000 Subject: [PATCH 58/81] jet: 0.6.26 -> 0.7.27 --- pkgs/development/tools/jet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/development/tools/jet/default.nix index beb15b4056c3..5341944e14cd 100644 --- a/pkgs/development/tools/jet/default.nix +++ b/pkgs/development/tools/jet/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "jet"; - version = "0.6.26"; + version = "0.7.27"; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-zlSIIZ0YV6ussgAylz8QGmKBi8MwIIMzmloIf4bHvHU="; + sha256 = "sha256-250/1DBNCXlU1b4jjLUUOXI+uSbOyPXtBN1JJRpdmFc="; }; extraNativeImageBuildArgs = [ From c27f08aa6c12bc9a4ea45e43c1e29695e339b214 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 9 Aug 2023 10:57:32 -0400 Subject: [PATCH 59/81] zig: default to zig 0.11 --- pkgs/top-level/all-packages.nix | 44 +++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ace60658b17..87846a63ded1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -595,11 +595,7 @@ with pkgs; dsq = callPackage ../tools/misc/dsq { }; - dt = callPackage ../tools/text/dt { - zigHook = zigHook.override { - zig = buildPackages.zig_0_11; - }; - }; + dt = callPackage ../tools/text/dt { }; dtv-scan-tables = callPackage ../data/misc/dtv-scan-tables { }; @@ -3016,11 +3012,7 @@ with pkgs; pikchr = callPackage ../tools/graphics/pikchr { }; - poop = callPackage ../tools/misc/poop { - zigHook = zigHook.override { - zig = buildPackages.zig_0_11; - }; - }; + poop = callPackage ../tools/misc/poop { }; popl = callPackage ../development/libraries/popl { }; @@ -6149,7 +6141,11 @@ with pkgs; rex = callPackage ../tools/system/rex { }; - river = callPackage ../applications/window-managers/river { }; + river = callPackage ../applications/window-managers/river { + zigHook = zigHook.override { + zig = buildPackages.zig_0_10; + }; + }; rivercarro = callPackage ../applications/misc/rivercarro { zigHook = zigHook.override { @@ -8003,7 +7999,11 @@ with pkgs; findutils = callPackage ../tools/misc/findutils { }; - findup = callPackage ../tools/misc/findup { }; + findup = callPackage ../tools/misc/findup { + zigHook = zigHook.override { + zig = buildPackages.zig_0_10; + }; + }; fingerprintx = callPackage ../tools/security/fingerprintx { }; @@ -9726,7 +9726,11 @@ with pkgs; ffmpeg = ffmpeg-full; }; - linuxwave = callPackage ../tools/audio/linuxwave { }; + linuxwave = callPackage ../tools/audio/linuxwave { + zigHook = zigHook.override { + zig = buildPackages.zig_0_10; + }; + }; littlefs-fuse = callPackage ../tools/filesystems/littlefs-fuse { }; @@ -14749,7 +14753,11 @@ with pkgs; stdenv = if stdenv.isDarwin then llvmPackages_16.stdenv else stdenv; }; - clipbuzz = callPackage ../tools/misc/clipbuzz { }; + clipbuzz = callPackage ../tools/misc/clipbuzz { + zigHook = zigHook.override { + zig = buildPackages.zig_0_10; + }; + }; xclip = callPackage ../tools/misc/xclip { }; @@ -25557,7 +25565,7 @@ with pkgs; zig_0_11 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.11.nix { llvmPackages = llvmPackages_16; }; - zig = zig_0_10; + zig = zig_0_11; zigHook = callPackage ../development/compilers/zig/hook.nix { }; @@ -41744,7 +41752,11 @@ with pkgs; duden = callPackage ../applications/misc/duden { }; - zf = callPackage ../tools/misc/zf { }; + zf = callPackage ../tools/misc/zf { + zigHook = zigHook.override { + zig = buildPackages.zig_0_10; + }; + }; isolate = callPackage ../tools/security/isolate { }; From 43b06e740364cb267d383fca2991d85636063646 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Thu, 10 Aug 2023 10:32:09 +1000 Subject: [PATCH 60/81] infracost: 0.10.27 -> 0.10.28 --- pkgs/tools/misc/infracost/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index 990cef6f6b44..90090d5f7ca3 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.27"; + version = "0.10.28"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-oxN1Ylrny/f72duLQQSt+Rz1h5s0BC3eUNXqh1sEL8Y="; + sha256 = "sha256-Gh/3uPkFEW6HBF4vbmZ00qaWD3FGTs7GUHRlfP3G5fY="; }; - vendorHash = "sha256-CGweNNOqgOiyyvVF20paO4LtvFiImQhu/kuLbXcYwwA="; + vendorHash = "sha256-mT214puF9gdrw0mfMPQQtZBdErW6MEJBIilKVo2ym30="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; From 0706a28c362e63c0a86f691ac788deb88ed91bf0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Aug 2023 18:40:25 +0000 Subject: [PATCH 61/81] bmake: 20230711 -> 20230723 --- pkgs/development/tools/build-managers/bmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index f1ceb79dcdfa..4373e534bc58 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20230711"; + version = "20230723"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-CoFULAPxoObCe/UBXY+7xSY04RkIOOx9p2RYR9kzL+8="; + hash = "sha256-xCoNlRuiP3ZlMxMJ+74h7cARNqI8uUFoULQxW+X7WQQ="; }; patches = [ From d8247503ab593eca5a5636084ec0f43f591d703b Mon Sep 17 00:00:00 2001 From: justinlime Date: Sat, 5 Aug 2023 16:01:03 -0500 Subject: [PATCH 62/81] vrrtest: init at 2.1.0 --- pkgs/tools/video/vrrtest/default.nix | 46 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/tools/video/vrrtest/default.nix diff --git a/pkgs/tools/video/vrrtest/default.nix b/pkgs/tools/video/vrrtest/default.nix new file mode 100644 index 000000000000..7a8e93a4f373 --- /dev/null +++ b/pkgs/tools/video/vrrtest/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, zip +, love +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vrrtest"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "Nixola"; + repo = "VRRTest"; + rev = "v${finalAttrs.version}"; + hash = "sha256-esyD+BpdnB8miUrIjV6P8Lho1xztmhLDnKxdQKW8GXc="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ zip ]; + + buildPhase = '' + runHook preBuild + zip -9 -r vrrtest.love . + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm444 -t $out/share/ vrrtest.love + makeWrapper ${love}/bin/love $out/bin/vrrtest \ + --add-flags $out/share/vrrtest.love + runHook postInstall + ''; + + meta = with lib; { + description = "Tool testing variable refresh rates"; + homepage = "https://github.com/Nixola/VRRTest"; + license = licenses.zlib; + mainProgram = "vrrtest"; + maintainers = with maintainers; [ justinlime ]; + inherit (love.meta) platforms; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ff28d5e65af..f1cf5ef12b4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1988,6 +1988,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + vrrtest = callPackage ../tools/video/vrrtest { }; + winbox = callPackage ../tools/admin/winbox { wine = wineWowPackages.staging; }; From cef068f3b3b0a9fdd68c45adc6847220ab988727 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Aug 2023 03:00:49 +0200 Subject: [PATCH 63/81] Revert "nixos/malloc: add back maybe unnecessary line" This reverts commit ed55524562e14131250b8362f47ccfe2d6e5a328. Does not evaluate. --- nixos/modules/config/malloc.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/config/malloc.nix b/nixos/modules/config/malloc.nix index 3d70e091983b..043f78c8214e 100644 --- a/nixos/modules/config/malloc.nix +++ b/nixos/modules/config/malloc.nix @@ -97,7 +97,6 @@ in }; config = mkIf (cfg.provider != "libc") { - boot.kernel.sysctl."vm.max_map_count" = mkIf (cfg.provider == "graphene-hardened") (mkDefault 1048576); # TODO: Default vm.max_map_count has been increased system-wide environment.etc."ld-nix.so.preload".text = '' ${providerLibPath} ''; From c13c1412bfeacf3df757a82476a57f8c3d2c2ba5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Aug 2023 01:40:47 +0200 Subject: [PATCH 64/81] nixos/chrony: add enableMemoryLocking option Fixes #222629. --- nixos/modules/services/networking/ntp/chrony.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index 2d421abc8be7..afd721e34da5 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -27,7 +27,10 @@ let ${cfg.extraConfig} ''; - chronyFlags = [ "-n" "-m" "-u" "chrony" "-f" "${configFile}" ] ++ cfg.extraFlags; + chronyFlags = + [ "-n" "-u" "chrony" "-f" "${configFile}" ] + ++ optional cfg.enableMemoryLocking "-m" + ++ cfg.extraFlags; in { options = { @@ -73,6 +76,15 @@ in ''; }; + enableMemoryLocking = mkOption { + type = types.bool; + default = config.environment.memoryAllocator.provider != "graphene-hardened"; + defaultText = ''config.environment.memoryAllocator.provider != "graphene-hardened"''; + description = lib.mdDoc '' + Whether to add the `-m` flag to lock memory. + ''; + }; + enableNTS = mkOption { type = types.bool; default = false; From 50e7a02e671cc4e5af49732b53d5d26f987cb314 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Aug 2023 02:02:33 +0200 Subject: [PATCH 65/81] nixos/chrony: add simple test --- nixos/tests/all-tests.nix | 1 + nixos/tests/chrony.nix | 31 ++++++++++++++++++++++++ pkgs/tools/networking/chrony/default.nix | 3 +++ 3 files changed, 35 insertions(+) create mode 100644 nixos/tests/chrony.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a2235b106dc6..530447b99786 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -167,6 +167,7 @@ in { cgit = handleTest ./cgit.nix {}; charliecloud = handleTest ./charliecloud.nix {}; chromium = (handleTestOn ["aarch64-linux" "x86_64-linux"] ./chromium.nix {}).stable or {}; + chrony = handleTestOn ["aarch64-linux" "x86_64-linux"] ./chrony.nix {}; chrony-ptp = handleTestOn ["aarch64-linux" "x86_64-linux"] ./chrony-ptp.nix {}; cinnamon = handleTest ./cinnamon.nix {}; cjdns = handleTest ./cjdns.nix {}; diff --git a/nixos/tests/chrony.nix b/nixos/tests/chrony.nix new file mode 100644 index 000000000000..578b1e32d50c --- /dev/null +++ b/nixos/tests/chrony.nix @@ -0,0 +1,31 @@ +import ./make-test-python.nix ({ lib, ... }: +{ + name = "chrony"; + + meta = { + maintainers = with lib.maintainers; [ fpletz ]; + }; + + nodes = { + default = { + services.chrony.enable = true; + }; + graphene-hardened = { + services.chrony.enable = true; + services.chrony.enableMemoryLocking = true; + environment.memoryAllocator.provider = "graphene-hardened"; + # dhcpcd privsep is incompatible with graphene-hardened + networking.useNetworkd = true; + }; + }; + + testScript = {nodes, ...} : let + graphene-hardened = nodes.graphene-hardened.system.build.toplevel; + in '' + default.start() + default.wait_for_unit('multi-user.target') + default.succeed('systemctl is-active chronyd.service') + default.succeed('${graphene-hardened}/bin/switch-to-configuration test') + default.succeed('systemctl is-active chronyd.service') + ''; +}) diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index c85c6d9febf4..c188fbb7ccd8 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, pkg-config , gnutls, libedit, nspr, nss, readline, texinfo , libcap, libseccomp, pps-tools +, nixosTests }: stdenv.mkDerivation rec { @@ -36,6 +37,8 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; + passthru.tests = { inherit (nixosTests) chrony chrony-ptp; }; + meta = with lib; { description = "Sets your computer's clock from time servers on the Net"; homepage = "https://chrony.tuxfamily.org/"; From a78c4457f0cf8be156d9893e2498631ea50c5fc8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Aug 2023 01:26:30 +0000 Subject: [PATCH 66/81] trunk-io: 1.2.6 -> 1.2.7 --- pkgs/development/tools/trunk-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/trunk-io/default.nix b/pkgs/development/tools/trunk-io/default.nix index c8685b8fcc9a..d9be944f61fb 100644 --- a/pkgs/development/tools/trunk-io/default.nix +++ b/pkgs/development/tools/trunk-io/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "trunk-io"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { url = "https://trunk.io/releases/launcher/${version}/trunk"; - hash = "sha256-CLgbN5m8tFBBGUQLfJuJOEptzCYLI5GJu4fUqrKkO6k="; + hash = "sha256-i2m+6Y6gvkHYwzESJv0DkLcHkXqz+g4e43TV6u1UTj8="; }; dontUnpack = true; From 7ddf588700eaad0545d9eb9541ca8346d8669787 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Aug 2023 01:39:01 +0000 Subject: [PATCH 67/81] go-camo: 2.4.3 -> 2.4.4 --- pkgs/servers/http/go-camo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/go-camo/default.nix b/pkgs/servers/http/go-camo/default.nix index d7198f44bb4a..a7761f341c0b 100644 --- a/pkgs/servers/http/go-camo/default.nix +++ b/pkgs/servers/http/go-camo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-camo"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "cactus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GRctsE+uAvyA0pcz+ym4sz3K80pUHoDipVsjFcdrT2A="; + sha256 = "sha256-27kAVuFJaGKt7q9E2tchAD6kSukO4xkhU+1JTPfT3Qk="; }; - vendorHash = "sha256-C66QxlMBupbHYktyzHapUrl0yk+pvWZN0BLhpjIGVzI="; + vendorHash = "sha256-LVQnQ8Tpkzpc6aUsUgwz2xTttccHynJPsQKvWGiRAIU="; ldflags = [ "-s" "-w" "-X=main.ServerVersion=${version}" ]; From 5f8e75fe6f3262eed8eb8a93ef1a4bfc81d2a4b9 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Wed, 9 Aug 2023 10:24:33 -0700 Subject: [PATCH 68/81] cargo-spellcheck: 0.12.4 -> 0.13.0 --- pkgs/development/tools/rust/cargo-spellcheck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index 5a9baa33403b..6e4051618bc1 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.12.4"; + version = "0.13.0"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h9114HFWIsJn95pJ3QoDokNgAkE6KFjDt5Rt85vT7zw="; + sha256 = "sha256-XqT2l839fRDNj6zJB0vlVMmoRB2Lz61cN297PNIvFX8="; }; - cargoSha256 = "sha256-hYCDpSKi7HlqwdnMnfnKw46VpO+bhsV11kIu/4yMaBw="; + cargoSha256 = "sha256-PzPQnexT1oeZ0FkTLyZiQJlMx+WDoSHD+J1JzoME6sA="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; From e09907580bb2d9b863671bdfaf7e3ddc6c019ded Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Aug 2023 01:59:00 +0000 Subject: [PATCH 69/81] darklua: 0.9.0 -> 0.10.2 --- pkgs/development/tools/darklua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/darklua/default.nix b/pkgs/development/tools/darklua/default.nix index 9258e1e10655..18fbafe3b555 100644 --- a/pkgs/development/tools/darklua/default.nix +++ b/pkgs/development/tools/darklua/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "darklua"; - version = "0.9.0"; + version = "0.10.2"; src = fetchFromGitHub { owner = "seaofvoices"; repo = "darklua"; rev = "v${version}"; - hash = "sha256-ABzhtAbWv2oM4VqxRUWC+xh2fwUw1s2iU1IWb5EEhiE="; + hash = "sha256-lZKf+05+qpQe21tMclYYUB9QBI6lC0vhNtsM4O3Jde4="; }; - cargoHash = "sha256-36YN/7aI69xsnwGz8oQG5RZu8XjQ9vwQtRNMWQ7pT0Q="; + cargoHash = "sha256-NnMjvi1H3VQGtklzXKPnZX1dOq3kCSiW8MnSvymtZ68="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From ca2530aa4ba2551dfb73b29b85d6cc41e09fffb3 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 10 Aug 2023 10:14:17 +0800 Subject: [PATCH 70/81] buf: 1.25.0 -> 1.26.1 --- 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 c066a9c55537..c0545a7d25e1 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.25.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-koYRJCO9G8McoFNe2P61y+q7T4gZ1MBNAy9jFC63kds="; + hash = "sha256-e00o3G66GCJyA3flqRa+J1yQVBVusBrEOJrL9viKtlM="; }; - vendorHash = "sha256-2UA8rp2ZHTUnYialFXrIlH+RzfZHtdKn0dc+Dfps8ow="; + vendorHash = "sha256-7RVYD0r3nqb0yLmKu9zzpQNiVDVBJGG1BiVb6J+VR9k="; patches = [ # Skip a test that requires networking to be available to work. From 17d404ee80589efa8473cf1b50d031487329419a Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 9 Aug 2023 20:43:09 -0400 Subject: [PATCH 71/81] zig.hook: rename from zigHook This makes using specific versions of zig easier (without overrides) --- doc/hooks/zig.section.md | 12 ++-- pkgs/applications/misc/colorstorm/default.nix | 6 +- pkgs/applications/misc/mepo/default.nix | 4 +- pkgs/applications/misc/rivercarro/default.nix | 6 +- pkgs/applications/misc/waylock/default.nix | 4 +- .../window-managers/river/default.nix | 4 +- pkgs/development/compilers/zig/0.10.nix | 1 + pkgs/development/compilers/zig/0.11.nix | 1 + pkgs/development/compilers/zig/0.9.1.nix | 1 + pkgs/development/compilers/zig/generic.nix | 7 ++ .../tools/language-servers/zls/default.nix | 4 +- pkgs/games/blackshades/default.nix | 4 +- pkgs/tools/audio/linuxwave/default.nix | 6 +- pkgs/tools/misc/clipbuzz/default.nix | 4 +- pkgs/tools/misc/findup/default.nix | 5 +- pkgs/tools/misc/ncdu/default.nix | 6 +- pkgs/tools/misc/poop/default.nix | 4 +- pkgs/tools/misc/zf/default.nix | 5 +- pkgs/tools/text/dt/default.nix | 4 +- pkgs/top-level/all-packages.nix | 71 +++---------------- 20 files changed, 59 insertions(+), 100 deletions(-) diff --git a/doc/hooks/zig.section.md b/doc/hooks/zig.section.md index 78b8262f4749..d85bcfd5c757 100644 --- a/doc/hooks/zig.section.md +++ b/doc/hooks/zig.section.md @@ -1,22 +1,22 @@ -# zigHook {#zighook} +# zig.hook {#zig-hook} [Zig](https://ziglang.org/) is a general-purpose programming language and toolchain for maintaining robust, optimal and reusable software. -In Nixpkgs, `zigHook` overrides the default build, check and install phases. +In Nixpkgs, `zig.hook` overrides the default build, check and install phases. ## Example code snippet {#example-code-snippet} ```nix { lib , stdenv -, zigHook +, zig }: stdenv.mkDerivation { # . . . nativeBuildInputs = [ - zigHook + zig.hook ]; zigBuildFlags = [ "-Dman-pages=true" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation { } ``` -## Variables controlling zigHook {#variables-controlling-zighook} +## Variables controlling zig.hook {#variables-controlling-zig-hook} ### `dontUseZigBuild` {#dontUseZigBuild} @@ -53,7 +53,7 @@ Disables using `zigInstallPhase`. Controls the flags passed to the install phase. -### Variables honored by zigHook {#variablesHonoredByZigHook} +### Variables honored by zig.hook {#variables-honored-by-zig-hook} - `prefixKey` - `dontAddPrefix` diff --git a/pkgs/applications/misc/colorstorm/default.nix b/pkgs/applications/misc/colorstorm/default.nix index 540d315d6371..0f78510aa2f6 100644 --- a/pkgs/applications/misc/colorstorm/default.nix +++ b/pkgs/applications/misc/colorstorm/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, zigHook +, zig_0_9 }: stdenv.mkDerivation (finalAttrs: { @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zigHook + zig_0_9.hook ]; meta = { @@ -24,6 +24,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/benbusby/colorstorm"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; - inherit (zigHook.meta) platforms; + inherit (zig_0_9.meta) platforms; }; }) diff --git a/pkgs/applications/misc/mepo/default.nix b/pkgs/applications/misc/mepo/default.nix index 54078891bd2b..a16b0bfebf59 100644 --- a/pkgs/applications/misc/mepo/default.nix +++ b/pkgs/applications/misc/mepo/default.nix @@ -17,7 +17,7 @@ , util-linux , xwininfo , zenity -, zigHook +, zig_0_10 }: stdenv.mkDerivation (finalAttrs: { @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config - zigHook + zig_0_10.hook makeWrapper ]; diff --git a/pkgs/applications/misc/rivercarro/default.nix b/pkgs/applications/misc/rivercarro/default.nix index ff53ba1a769f..59537500878e 100644 --- a/pkgs/applications/misc/rivercarro/default.nix +++ b/pkgs/applications/misc/rivercarro/default.nix @@ -4,7 +4,7 @@ , pkg-config , river , wayland -, zigHook +, zig_0_9 }: stdenv.mkDerivation (finalAttrs: { @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config river wayland - zigHook + zig_0_9.hook ]; meta = with lib; { @@ -42,6 +42,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://git.sr.ht/~novakane/rivercarro/refs/v${finalAttrs.version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kraem ]; - inherit (zigHook.meta) platforms; + inherit (zig_0_9.meta) platforms; }; }) diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix index cfd4afee67b3..ba2a97534d36 100644 --- a/pkgs/applications/misc/waylock/default.nix +++ b/pkgs/applications/misc/waylock/default.nix @@ -7,7 +7,7 @@ , scdoc , wayland , wayland-protocols -, zigHook +, zig_0_10 }: stdenv.mkDerivation (finalAttrs: { @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config scdoc wayland - zigHook + zig_0_10.hook ]; buildInputs = [ diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 41b9324db413..53714a03c5c3 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -14,7 +14,7 @@ , wayland-protocols , wlroots_0_16 , xwayland -, zigHook +, zig_0_10 , withManpages ? true , xwaylandSupport ? true }: @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config wayland xwayland - zigHook + zig_0_10.hook ] ++ lib.optional withManpages scdoc; diff --git a/pkgs/development/compilers/zig/0.10.nix b/pkgs/development/compilers/zig/0.10.nix index c21a51afa5b3..9262679d2028 100644 --- a/pkgs/development/compilers/zig/0.10.nix +++ b/pkgs/development/compilers/zig/0.10.nix @@ -6,6 +6,7 @@ , libxml2 , zlib , coreutils +, callPackage }@args: import ./generic.nix args { diff --git a/pkgs/development/compilers/zig/0.11.nix b/pkgs/development/compilers/zig/0.11.nix index 7c4fcedc0538..b393f42c6513 100644 --- a/pkgs/development/compilers/zig/0.11.nix +++ b/pkgs/development/compilers/zig/0.11.nix @@ -6,6 +6,7 @@ , libxml2 , zlib , coreutils +, callPackage }@args: import ./generic.nix args { diff --git a/pkgs/development/compilers/zig/0.9.1.nix b/pkgs/development/compilers/zig/0.9.1.nix index a05d5ae893cf..fa72647d6cc0 100644 --- a/pkgs/development/compilers/zig/0.9.1.nix +++ b/pkgs/development/compilers/zig/0.9.1.nix @@ -6,6 +6,7 @@ , libxml2 , zlib , coreutils +, callPackage }@args: import ./generic.nix args { diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index 5cc75cbbf6eb..4651e9e68e54 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -6,6 +6,7 @@ , libxml2 , zlib , coreutils +, callPackage , ... }: @@ -53,6 +54,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstallCheck ''; + passthru = { + hook = callPackage ./hook.nix { + zig = finalAttrs.finalPackage; + }; + }; + meta = { description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; homepage = "https://ziglang.org/"; diff --git a/pkgs/development/tools/language-servers/zls/default.nix b/pkgs/development/tools/language-servers/zls/default.nix index 1bf1f3dbb7b2..7e76942c1598 100644 --- a/pkgs/development/tools/language-servers/zls/default.nix +++ b/pkgs/development/tools/language-servers/zls/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, zigHook +, zig , callPackage }: @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zigHook + zig.hook ]; postPatch = '' diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index c107b068816c..80fc72341501 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -6,7 +6,7 @@ , libGLU , libsndfile , openal -, zigHook +, zig_0_9 }: stdenv.mkDerivation (finalAttrs: { @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Hg+VcWI28GzY/CPm1lUftP0RGztOnzizrKJQVTmeJ9I="; }; - nativeBuildInputs = [ zigHook ]; + nativeBuildInputs = [ zig_0_9.hook ]; buildInputs = [ glfw diff --git a/pkgs/tools/audio/linuxwave/default.nix b/pkgs/tools/audio/linuxwave/default.nix index 213a40909886..98860675dafc 100644 --- a/pkgs/tools/audio/linuxwave/default.nix +++ b/pkgs/tools/audio/linuxwave/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , installShellFiles -, zigHook +, zig_0_10 }: stdenv.mkDerivation (finalAttrs: { @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles - zigHook + zig_0_10.hook ]; postInstall = '' @@ -32,6 +32,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/orhun/linuxwave/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ figsoda ]; - inherit (zigHook.meta) platforms; + inherit (zig_0_10.meta) platforms; }; }) diff --git a/pkgs/tools/misc/clipbuzz/default.nix b/pkgs/tools/misc/clipbuzz/default.nix index 9d901f90a205..47dbbc6e6ff2 100644 --- a/pkgs/tools/misc/clipbuzz/default.nix +++ b/pkgs/tools/misc/clipbuzz/default.nix @@ -3,7 +3,7 @@ , fetchFromSourcehut , libX11 , libXfixes -, zigHook +, zig_0_10 }: stdenv.mkDerivation (finalAttrs: { @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-V5bAZHoScTzFZBPUhPd7xc/c32SXPLAJp+vsc/lCyeI="; }; - nativeBuildInputs = [ zigHook ]; + nativeBuildInputs = [ zig_0_10.hook ]; buildInputs = [ libX11 diff --git a/pkgs/tools/misc/findup/default.nix b/pkgs/tools/misc/findup/default.nix index 11bf1918574d..d196192447d8 100644 --- a/pkgs/tools/misc/findup/default.nix +++ b/pkgs/tools/misc/findup/default.nix @@ -1,9 +1,8 @@ { lib , stdenv , fetchFromGitHub -, findup , testers -, zigHook +, zig_0_10 }: stdenv.mkDerivation (finalAttrs: { @@ -17,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Tpyiy5oJQ04lqVEOFshFC0+90VoNILQ+N6Dd7lbuH/Q="; }; - nativeBuildInputs = [ zigHook ]; + nativeBuildInputs = [ zig_0_10.hook ]; passthru.tests.version = testers.testVersion { package = finalAttrs.findup; }; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 3cb407756f67..8e66e775c1fc 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , ncurses -, zigHook +, zig_0_10 }: stdenv.mkDerivation (finalAttrs: { @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zigHook + zig_0_10.hook ]; buildInputs = [ @@ -28,6 +28,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://dev.yorhel.nl/ncdu/changes2"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pSub rodrgz ]; - inherit (zigHook.meta) platforms; + inherit (zig_0_10.meta) platforms; }; }) diff --git a/pkgs/tools/misc/poop/default.nix b/pkgs/tools/misc/poop/default.nix index 8c30f409ed33..d07c2c150be3 100644 --- a/pkgs/tools/misc/poop/default.nix +++ b/pkgs/tools/misc/poop/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , fetchpatch -, zigHook +, zig }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - zigHook + zig.hook ]; meta = with lib; { diff --git a/pkgs/tools/misc/zf/default.nix b/pkgs/tools/misc/zf/default.nix index 1dec403dcd92..041f2a3989cc 100644 --- a/pkgs/tools/misc/zf/default.nix +++ b/pkgs/tools/misc/zf/default.nix @@ -3,8 +3,7 @@ , fetchFromGitHub , installShellFiles , testers -, zf -, zigHook +, zig_0_10 }: stdenv.mkDerivation (finalAttrs: { @@ -21,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles - zigHook + zig_0_10.hook ]; doCheck = false; # it's failing somehow diff --git a/pkgs/tools/text/dt/default.nix b/pkgs/tools/text/dt/default.nix index b0b269d0c430..e4c6894050ff 100644 --- a/pkgs/tools/text/dt/default.nix +++ b/pkgs/tools/text/dt/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , testers -, zigHook +, zig }: stdenv.mkDerivation (finalAttrs: { @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-C6sG8iqXs64x2AWCxKGFPyoXC1Fn4p2eSLWwJAQ8CSc="; }; - nativeBuildInputs = [ zigHook ]; + nativeBuildInputs = [ zig.hook ]; passthru.tests.version = testers.testVersion { package = finalAttrs.dt; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94b81faec919..361830c72f5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -509,11 +509,7 @@ with pkgs; colorpicker = callPackage ../tools/misc/colorpicker { }; - colorstorm = callPackage ../applications/misc/colorstorm { - zigHook = zigHook.override { - zig = buildPackages.zig_0_9; - }; - }; + colorstorm = callPackage ../applications/misc/colorstorm { }; comedilib = callPackage ../development/libraries/comedilib { }; @@ -6143,17 +6139,9 @@ with pkgs; rex = callPackage ../tools/system/rex { }; - river = callPackage ../applications/window-managers/river { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + river = callPackage ../applications/window-managers/river { }; - rivercarro = callPackage ../applications/misc/rivercarro { - zigHook = zigHook.override { - zig = buildPackages.zig_0_9; - }; - }; + rivercarro = callPackage ../applications/misc/rivercarro { }; river-luatile = callPackage ../applications/misc/river-luatile{ }; @@ -8001,11 +7989,7 @@ with pkgs; findutils = callPackage ../tools/misc/findutils { }; - findup = callPackage ../tools/misc/findup { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + findup = callPackage ../tools/misc/findup { }; fingerprintx = callPackage ../tools/security/fingerprintx { }; @@ -9728,11 +9712,7 @@ with pkgs; ffmpeg = ffmpeg-full; }; - linuxwave = callPackage ../tools/audio/linuxwave { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + linuxwave = callPackage ../tools/audio/linuxwave { }; littlefs-fuse = callPackage ../tools/filesystems/littlefs-fuse { }; @@ -14755,11 +14735,7 @@ with pkgs; stdenv = if stdenv.isDarwin then llvmPackages_16.stdenv else stdenv; }; - clipbuzz = callPackage ../tools/misc/clipbuzz { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + clipbuzz = callPackage ../tools/misc/clipbuzz { }; xclip = callPackage ../tools/misc/xclip { }; @@ -18346,11 +18322,7 @@ with pkgs; vscode-langservers-extracted = callPackage ../development/tools/language-servers/vscode-langservers-extracted { }; - zls = callPackage ../development/tools/language-servers/zls { - zigHook = zigHook.override { - zig = buildPackages.zig_0_11; - }; - }; + zls = callPackage ../development/tools/language-servers/zls { }; ansible-later = callPackage ../tools/admin/ansible/later.nix { }; @@ -25569,8 +25541,6 @@ with pkgs; }; zig = zig_0_11; - zigHook = callPackage ../development/compilers/zig/hook.nix { }; - zimlib = callPackage ../development/libraries/zimlib { }; zita-convolver = callPackage ../development/libraries/audio/zita-convolver { }; @@ -32461,11 +32431,7 @@ with pkgs; waycorner = callPackage ../applications/misc/waycorner { }; - waylock = callPackage ../applications/misc/waylock { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + waylock = callPackage ../applications/misc/waylock { }; wayshot = callPackage ../tools/misc/wayshot { }; @@ -33445,9 +33411,6 @@ with pkgs; mepo = callPackage ../applications/misc/mepo { inherit (gnome) zenity; - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; }; meshcentral = callPackage ../tools/admin/meshcentral { }; @@ -34116,11 +34079,7 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; - ncdu = callPackage ../tools/misc/ncdu { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + ncdu = callPackage ../tools/misc/ncdu { }; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; @@ -37282,11 +37241,7 @@ with pkgs; inherit (perlPackages) PathTiny; }; - blackshades = callPackage ../games/blackshades { - zigHook = zigHook.override { - zig = buildPackages.zig_0_9; - }; - }; + blackshades = callPackage ../games/blackshades { }; blobby = callPackage ../games/blobby { }; @@ -41756,11 +41711,7 @@ with pkgs; duden = callPackage ../applications/misc/duden { }; - zf = callPackage ../tools/misc/zf { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + zf = callPackage ../tools/misc/zf { }; isolate = callPackage ../tools/security/isolate { }; From 59eb02116f61a70a8bdeb125329833133ef36a06 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 9 Aug 2023 20:55:18 -0400 Subject: [PATCH 72/81] treewide: use zig_0_11 instead of zig for zig packages Zig is still under active development, and new releases often introduce breaking changes. This makes updating the default version of zig easier. Some packages did not receive this change because they could be using the c compiler or linker of zig, which doesn't receive as much breaking changes compared to e.g. the zig std library. https://github.com/NixOS/nixpkgs/pull/248243#discussion_r1289401340 --- doc/hooks/zig.section.md | 4 ++-- pkgs/development/tools/language-servers/zls/default.nix | 4 ++-- pkgs/tools/misc/poop/default.nix | 4 ++-- pkgs/tools/text/dt/default.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/hooks/zig.section.md b/doc/hooks/zig.section.md index d85bcfd5c757..483fd285f416 100644 --- a/doc/hooks/zig.section.md +++ b/doc/hooks/zig.section.md @@ -9,14 +9,14 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases. ```nix { lib , stdenv -, zig +, zig_0_11 }: stdenv.mkDerivation { # . . . nativeBuildInputs = [ - zig.hook + zig_0_11.hook ]; zigBuildFlags = [ "-Dman-pages=true" ]; diff --git a/pkgs/development/tools/language-servers/zls/default.nix b/pkgs/development/tools/language-servers/zls/default.nix index 7e76942c1598..9fda43915ca2 100644 --- a/pkgs/development/tools/language-servers/zls/default.nix +++ b/pkgs/development/tools/language-servers/zls/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, zig +, zig_0_11 , callPackage }: @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig.hook + zig_0_11.hook ]; postPatch = '' diff --git a/pkgs/tools/misc/poop/default.nix b/pkgs/tools/misc/poop/default.nix index d07c2c150be3..fe595f76ffaa 100644 --- a/pkgs/tools/misc/poop/default.nix +++ b/pkgs/tools/misc/poop/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , fetchpatch -, zig +, zig_0_11 }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - zig.hook + zig_0_11.hook ]; meta = with lib; { diff --git a/pkgs/tools/text/dt/default.nix b/pkgs/tools/text/dt/default.nix index e4c6894050ff..8b892f6126ea 100644 --- a/pkgs/tools/text/dt/default.nix +++ b/pkgs/tools/text/dt/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , testers -, zig +, zig_0_11 }: stdenv.mkDerivation (finalAttrs: { @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-C6sG8iqXs64x2AWCxKGFPyoXC1Fn4p2eSLWwJAQ8CSc="; }; - nativeBuildInputs = [ zig.hook ]; + nativeBuildInputs = [ zig_0_11.hook ]; passthru.tests.version = testers.testVersion { package = finalAttrs.dt; }; From 1bb5757696ac14aecd96054fb54a869d84b943c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Aug 2023 02:39:23 +0000 Subject: [PATCH 73/81] kube-bench: 0.6.15 -> 0.6.17 --- pkgs/tools/security/kube-bench/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/kube-bench/default.nix b/pkgs/tools/security/kube-bench/default.nix index e25a5d5e0e79..0d154eac1381 100644 --- a/pkgs/tools/security/kube-bench/default.nix +++ b/pkgs/tools/security/kube-bench/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-bench"; - version = "0.6.15"; + version = "0.6.17"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oZLhHIbDPftm8OVjyBj6/8pcLRX2OvtEU0uwYWIaR/c="; + hash = "sha256-9pXW8PVJhaYi9uKArIJcXbQ6FbCjFA4z9f5M3DLKnng="; }; vendorHash = "sha256-dBN6Yi8HtS9LzXr08jhw1hqDwS8a4UqrYaRpM+RzvVM="; From 76513b24d7ee22bfc213e24b45f6b3b4ec356b56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Aug 2023 00:28:25 +0000 Subject: [PATCH 74/81] openmsx: 18.0 -> 19.0 --- pkgs/applications/emulators/openmsx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/openmsx/default.nix b/pkgs/applications/emulators/openmsx/default.nix index 4dfa3b864430..9def450b0345 100644 --- a/pkgs/applications/emulators/openmsx/default.nix +++ b/pkgs/applications/emulators/openmsx/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openmsx"; - version = "18.0"; + version = "19.0"; src = fetchFromGitHub { owner = "openMSX"; repo = "openMSX"; rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] finalAttrs.version}"; - sha256 = "sha256-4V2B+OQbPVRmkRuqfeqyd+7pz9Z1YISjI79WqZS0Qhc="; + sha256 = "sha256-NR0+vOUkbyuVWdHLmKEewDDmR1ibi3dtbSq+6RaxrGo="; fetchSubmodules = true; }; From 484cd7bbff82f768b5ee41e1d62b484a23532226 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Thu, 10 Aug 2023 13:37:57 +1000 Subject: [PATCH 75/81] flexget: 3.8.2 -> 3.8.3 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 8a5843d2bbec..0f9238509bcc 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.8.2"; + version = "3.8.3"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-IdjNk1GyJcNwHqm/ZYdHRh6a/XAD5p41Vu8JdPuCglE="; + hash = "sha256-qGc5L9hL4KbcHGZvhvzqBg1ATFHWGKM72O/aDhrCV4Q="; }; postPatch = '' From 58bc54ca2a00a253a79b33deecc76d37e811a454 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 03:06:34 +0000 Subject: [PATCH 76/81] terraform-providers.cloudflare: 4.11.0 -> 4.12.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8206a28faf0c..60b578f03b61 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -218,13 +218,13 @@ "vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q=" }, "cloudflare": { - "hash": "sha256-vC3uvv04an6KhXT1FECiB2LQMxJbiYhULNuiXoCRhnY=", + "hash": "sha256-ayxekJkQt/7K/qwMKvjqkyVkux5+Jw3uyepmaiy3Ptc=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.11.0", + "rev": "v4.12.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-m+tQeOUbJ+bnVYl4FcBSTHKYuSGtznCqRQ/CR204WkE=" + "vendorHash": "sha256-VTSbi2pDllzyKDhWs5EpWSXO5oKl+khVqLg/Ro3x8ys=" }, "cloudfoundry": { "hash": "sha256-hoX2KNUzC7G+bFxReTN/6IG8/P4rczHAYn2QQ2iOioc=", From 1680a9bf825e68b7fac14bb5a3604372453e92d5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 03:07:15 +0000 Subject: [PATCH 77/81] terraform-providers.exoscale: 0.50.0 -> 0.51.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 60b578f03b61..e445eec83023 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -372,11 +372,11 @@ "vendorHash": "sha256-7a90fzAU76QRXkSa+G/N3kMPP8jy68i72i2JSlUrvfc=" }, "exoscale": { - "hash": "sha256-dLA9BWW4ghD1OSZaZtFfv8ipS+2lTeNRr1YD3E8ewpI=", + "hash": "sha256-93pCsHrsYLJYgg8MXHz2Gg+vaPC9gcHdLastb89/BMg=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.50.0", + "rev": "v0.51.0", "spdx": "MPL-2.0", "vendorHash": null }, From a2495b2c5da2748e3cdf38db03be14530f2a6fee Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 03:07:45 +0000 Subject: [PATCH 78/81] terraform-providers.fastly: 5.3.0 -> 5.3.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e445eec83023..43b1cd4bfe90 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -390,11 +390,11 @@ "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" }, "fastly": { - "hash": "sha256-90mVwC90lkvNRvyt5aKBE3h0XZTVXvWVVG6qIP+4pOk=", + "hash": "sha256-Pd79xIFu+vwynwVqDFqkuhg8NczkbCF2eWOXrLOPCGI=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v5.3.0", + "rev": "v5.3.1", "spdx": "MPL-2.0", "vendorHash": null }, From b4c7b7e5aab416e39eeed8944b64416a71fca0d4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 03:13:49 +0000 Subject: [PATCH 79/81] terraform-providers.oci: 5.7.0 -> 5.8.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 43b1cd4bfe90..457bedc767ef 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -827,11 +827,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-PLlgHUIQWxBCBmTRuQ6RSLuqkilqUb4svmklbSoYEtA=", + "hash": "sha256-dB8yoUPv6uYKveZxCblwif2FKW0qNdY5CJMpbZivB78=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.7.0", + "rev": "v5.8.0", "spdx": "MPL-2.0", "vendorHash": null }, From 5663dc29dc39c9ae8dec41b9f7655c30f0c2eab3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Aug 2023 04:32:02 +0000 Subject: [PATCH 80/81] vdrPlugins.softhddevice: 1.11.1 -> 1.11.2 --- pkgs/applications/video/vdr/softhddevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 1be01e63fc58..f4630dda62ed 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-+itSxkyst/KJzyT8ALJkCKumrHHKiWfnvikonwexgnc="; + sha256 = "sha256-V/jkwj/FWgebT4w/n9R5p5xiRNacTolnS3/SYy7FJwA="; rev = "v${version}"; }; From 6d530a638991c7ec728e1f5e67390e895d48ce3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Aug 2023 04:42:38 +0000 Subject: [PATCH 81/81] seqkit: 2.5.0 -> 2.5.1 --- pkgs/applications/science/biology/seqkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/seqkit/default.nix b/pkgs/applications/science/biology/seqkit/default.nix index e785d6c25f3f..32f46e485098 100644 --- a/pkgs/applications/science/biology/seqkit/default.nix +++ b/pkgs/applications/science/biology/seqkit/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "seqkit"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "shenwei356"; repo = "seqkit"; rev = "v${version}"; - sha256 = "sha256-pk4HNtG2x3zZ+GEH5MNn/XPNSmx8zGWbVYPGCYIZucs="; + sha256 = "sha256-aS8aTh8Lszob9It89shhKyqxCDjFs7zxE3VhMCHYaGM="; }; vendorHash = "sha256-54kb9Na76+CgW61SnXu7EfO0InH/rjliNRcH2M/gxII=";