From 0782eb2b02348cc501a3eb8a6cfcf0d384a0decf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 23:08:08 +0200 Subject: [PATCH 01/51] python311Packages.dbus-fast: 1.85.0 -> 1.86.0 Diff: https://github.com/Bluetooth-Devices/dbus-fast/compare/refs/tags/v1.85.0...v1.86.0 Changelog: https://github.com/Bluetooth-Devices/dbus-fast/releases/tag/v1.86.0 --- pkgs/development/python-modules/dbus-fast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index f0a63c4909c4..58551be4de1f 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.85.0"; + version = "1.86.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pl5Qs7llmUna+i85hMl14UhTDkibPEcMaRnsPM7ODFg="; + hash = "sha256-YSkSnRQqalHpRVJx5PUO8EXXV8V6jRNpycO/GqNWmIM="; }; nativeBuildInputs = [ From b5ae7370bb9a1f6ea57d27f0a9a5dcda7cab61e4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 May 2023 14:27:07 +0200 Subject: [PATCH 02/51] ssh-mitm: move to top level --- .../security}/ssh-mitm/default.nix | 34 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 22 insertions(+), 17 deletions(-) rename pkgs/{development/python-modules => tools/security}/ssh-mitm/default.nix (60%) diff --git a/pkgs/development/python-modules/ssh-mitm/default.nix b/pkgs/tools/security/ssh-mitm/default.nix similarity index 60% rename from pkgs/development/python-modules/ssh-mitm/default.nix rename to pkgs/tools/security/ssh-mitm/default.nix index d5c890b2dda4..9d40f86354b5 100644 --- a/pkgs/development/python-modules/ssh-mitm/default.nix +++ b/pkgs/tools/security/ssh-mitm/default.nix @@ -1,25 +1,30 @@ { lib -, argcomplete -, buildPythonPackage , fetchFromGitHub -, pythonOlder -, colored -, packaging -, paramiko -, pytz -, pyyaml -, rich -, sshpubkeys -, pytestCheckHook +, python3 }: -buildPythonPackage rec { +let + py = python3.override { + packageOverrides = self: super: { + paramiko = super.paramiko.overridePythonAttrs (oldAttrs: rec { + version = "3.1.0"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-aVD6ymgZrNMhnUrmlKI8eofuONCE9wwXJLDA27i3V2k="; + }; + patches = [ ]; + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ python3.pkgs.icecream ]; + }); + }; + }; +in +with py.pkgs; + +buildPythonApplication rec { pname = "ssh-mitm"; version = "3.0.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = pname; repo = pname; @@ -35,6 +40,7 @@ buildPythonPackage rec { pytz pyyaml rich + setuptools sshpubkeys ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce676ce4849a..ba26bd535449 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3667,7 +3667,7 @@ with pkgs; ssh-key-confirmer = callPackage ../tools/networking/ssh-key-confirmer { }; - ssh-mitm = with python3Packages; toPythonApplication ssh-mitm; + ssh-mitm = callPackage ../tools/security/ssh-mitm { }; sshchecker = callPackage ../tools/security/sshchecker { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d1652a947a61..0fd02ce62212 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -268,6 +268,7 @@ mapAliases ({ selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 setuptools_scm = setuptools-scm; # added 2021-06-03 sharkiqpy = sharkiq; # added 2022-05-21 + ssh-mitm = throw "ssh-mitm was removed in favor of the top-level ssh-mitm"; # added 2023-05-09 smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff799a3bc250..141fefabd617 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11443,8 +11443,6 @@ self: super: with self; { sseclient-py = callPackage ../development/python-modules/sseclient-py { }; - ssh-mitm = callPackage ../development/python-modules/ssh-mitm { }; - sshfs = callPackage ../development/python-modules/sshfs { }; sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; From 1e39b542b953af2b86ac0f2cb639aef3b745beda Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 18 May 2023 18:47:56 +0200 Subject: [PATCH 03/51] moodle: 4.1.2 -> 4.1.3 Fixes CVE-2023-30943 and CVE-2023-30944. https://moodledev.io/general/releases/4.1/4.1.3 --- pkgs/servers/web-apps/moodle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 5ffbe05e7369..5eb3d997a053 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }: let - version = "4.1.2"; + version = "4.1.3"; versionParts = lib.take 2 (lib.splitVersion version); # 4.2 -> 402, 3.11 -> 311 @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "sha256-ddXldOQLefV6Kjla+IeFwD50Vye4kholJD5R6X6A2Og="; + hash = "sha256-JMK+nGgeBryC6I9cg1DD52gIGcPMAJ/xZxrC4a1R5Ps="; }; phpConfig = writeText "config.php" '' From 3984e71278fa2794b097569435b7054805cbbadc Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 19 May 2023 10:27:39 -0400 Subject: [PATCH 04/51] gopatch: init at 0.2.0 https://github.com/uber-go/gopatch --- .../tools/misc/gopatch/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/tools/misc/gopatch/default.nix diff --git a/pkgs/development/tools/misc/gopatch/default.nix b/pkgs/development/tools/misc/gopatch/default.nix new file mode 100644 index 000000000000..8f83782adbde --- /dev/null +++ b/pkgs/development/tools/misc/gopatch/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, gopatch +}: + +buildGoModule rec { + pname = "gopatch"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "uber-go"; + repo = "gopatch"; + rev = "v${version}"; + hash = "sha256-RodRDP7n1hxez+9xpRlguuArJDVaYxVTpnXKqsyqnUw="; + }; + + vendorHash = "sha256-vygEVVh/bBhV/FCrehDumrw2c1SdSZSdFjVSRoJsIig="; + + subPackages = [ + "." + ]; + + ldflags = [ + "-s" + "-w" + "-X=main._version=${version}" + ]; + + passthru.tests = { + version = testers.testVersion { + package = gopatch; + }; + }; + + meta = with lib; { + description = "Refactoring and code transformation tool for Go"; + homepage = "https://github.com/uber-go/gopatch"; + changelog = "https://github.com/uber-go/gopatch/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b03392cf33e..bc14baf778ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18434,6 +18434,8 @@ with pkgs; gocd-server = callPackage ../development/tools/continuous-integration/gocd-server { }; + gopatch = callPackage ../development/tools/misc/gopatch { }; + goredo = callPackage ../development/tools/build-managers/goredo { }; gotify-server = callPackage ../servers/gotify { }; From 0726893a4c6ae76adcfd839520b6d2eab79bc599 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 19 May 2023 17:10:56 -0400 Subject: [PATCH 05/51] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 634 +++++++++--------- 1 file changed, 323 insertions(+), 311 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index e357eb4f25d7..ef01afbc4b56 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPluginFrom2Nix { pname = "LazyVim"; - version = "2023-05-13"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "bd1ba54d1347c1f340db896f25e43c8591365512"; - sha256 = "02gh9f9nfxd0z5vi41q8zjmz0gqb6lb6rgl8xbspmasszil6fx9n"; + rev = "b227d9727a7ae1f0ad48504d613fb099dc9c461b"; + sha256 = "02zk79ln1rp9mhf74vwyzkzzzh0mwki0ak4fwy5261p53z6l09m9"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2023-05-06"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "81e6e90c212e600d288d45c7e07c379ff445e298"; - sha256 = "1p5zz28cjxir0xpk23hywfa0wsx0al5n3z2cr248qy02igfwvbks"; + rev = "ada80ec869446d46a8b595ea913507f7d5928f60"; + sha256 = "04xjbvi5kiixwdn6sdhsd63hjnv47nwj42y33fxp6iifbsix3jzl"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-05-10"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "301471a8611494ceb7255003bc9d3c6fb8584009"; - sha256 = "0zwqms3fxln4c2hd9aivs7bykfilzm79yrqir3jd5xxh3d63a607"; + rev = "22f5e69f395eb9a47289b66af1ccb07e8f783016"; + sha256 = "0l51g8sns1fgd572fn32j79zgid44v0864pjg29m6zhrcmdpc9lm"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-05-04"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "d8f2699f7ae0e5eb62424d7b2ad80ce30179ee92"; - sha256 = "1ir8yqj1zjbby4rn3cygf8rlxyk0arcrdd2jbxhpcj07ijzv037l"; + rev = "3a17406d9d8f01f46d207f42d8849eb924eb0755"; + sha256 = "00186chkr4y8k4yv5crlnkn1v2smw151hc4ga4swikvnkclddg2c"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -835,12 +835,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2023-05-12"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "571ecb873654554109f63eac3193b133aec2f90c"; - sha256 = "13sz4nvny3d8mqh7p13hhgvvlddink9wrn405bfvny2nlwn70s9a"; + rev = "8a7dbcd718086877c7d75d6f36615b34674cad4b"; + sha256 = "1c7cwdmh1hv1gkvzism31s6flqlc3wscj43nbw7v98wdrn224q15"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -919,12 +919,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-05-12"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "875ae20301cf13b8410f75d62857f87e2c53a58b"; - sha256 = "0g5qi8mpjbbqg5cwh0w7c0j9mwcy23mazsw4s5dcqdvwsa675mx5"; + rev = "cf3cae24e762f9d63de1a85a1a83c8cdeafeb344"; + sha256 = "1i0nq5s9pwfpj4cksw4pgj2kmcvyh7zlxd7f2alygp94hw0kbzwb"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -955,7 +955,7 @@ final: prev: base46 = buildVimPluginFrom2Nix { pname = "base46"; - version = "unstable-2023-05-06"; + version = "2023-05-06"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; @@ -1135,12 +1135,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2023-05-09"; + version = "2023-05-14"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "018bdf61a97e00caeff05d16977437c63018762e"; - sha256 = "049671bk50d4lq1dmvp7lafbc9pkw2n2hhn9wcsvdkfyn0q5cpdj"; + rev = "1952c33e425ede785d26aa9e250addfe304a8510"; + sha256 = "0rcr2aj38ln07riil516c40fakaqzv72c2d1as7b6n8qikz9by7a"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1195,12 +1195,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2023-05-12"; + version = "2023-05-16"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "c1e253943f7619b85f2a5480a63fff8d22ddb54f"; - sha256 = "14gdi5bmld8bd970drql4ana79chzricavjxwxsyp5d0365lvqy6"; + rev = "78aed26e18a087501be0475443b5a623adbf6290"; + sha256 = "1lqx08xx41z5m4w9sdqyclk1ylbphp1y7lkh2sdlc4pyqx15k7c1"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1519,12 +1519,12 @@ final: prev: cmp-git = buildVimPluginFrom2Nix { pname = "cmp-git"; - version = "2023-05-12"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "bace35c2ad3c86d35ed67862939b99afd9ff5932"; - sha256 = "1wf4qzlmqdisa4y54xvyvvahw6naf68vysyh4rcbc3k1gzmd7d3i"; + rev = "3b58a59f0238318ba20b1e19a1dec8e3589da2dc"; + sha256 = "0yrcbqq9fc05s7p0mji7bq782z67ybiia3fnd2whl8sd0g5hray7"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -1963,12 +1963,12 @@ final: prev: codeium-vim = buildVimPluginFrom2Nix { pname = "codeium.vim"; - version = "2023-05-13"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "4705d901e203e58c8f8e2f9413d745b407d59427"; - sha256 = "0g2hf3ngsx351r8j85r4il4jhci5pdk6hx0lfk625x3y6kc3zgsw"; + rev = "581ba9718f4416b4107273ffbce9c0a821835832"; + sha256 = "1fnlfz3m644zbdsr7iwdlkgcnyp0p07fpcxpwrd47bl5c00sf343"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2215,12 +2215,12 @@ final: prev: context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype.vim"; - version = "2022-09-14"; + version = "2023-05-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "e276626e441eee2c624b9192113f1484bc2bc0f3"; - sha256 = "1yjpmqabxhfdrbyggc6smc07hqrp770z22ajdnw2wcymam0j3g0g"; + rev = "512db78eb08f284a71bdd83b3ff27026334a3ab2"; + sha256 = "1ab12rir32yhl42ih2zfp7w8f3spi765622xj87aha4jxir20i2f"; }; meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; @@ -2263,24 +2263,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-05-07"; + version = "2023-05-14"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "6e15912d7cb19c4c0f5d947b8d95bb54099a1dfb"; - sha256 = "1s46b2qz66v2whyq7zkfkn1gf1cvn1wklippbwbr4slk33rqg77g"; + rev = "1ded9a1b8cd80616d5909a3ec5859feda66a7f2e"; + sha256 = "1nr65pz6xiajyh9k9s5p95bd2v9br8g1r0gk3s9lz9hqyb2fpzx9"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-05-07"; + version = "2023-05-14"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "5f6b110575c123de369604f4846440089bfb938f"; - sha256 = "1r7a6fdysqzghqpl9jvha5jhcdxh73n3yr21gh5q11qz6sz34zcw"; + rev = "0c8d7e2f8652ee0a327df8e4e027e20d4d7ba616"; + sha256 = "1isv1v4aj6qfngn4pdqd2lvb22j0n5iaa4f9v80rz6614cgsvwl1"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2299,12 +2299,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-05-07"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "1349edcd03478718223edd0abbe23990c38c10c4"; - sha256 = "1h7rzy329d7my41164kddvknvsy81c66n1s28ycz8b4wzzz91i6i"; + rev = "b0eda162151cdd912ef2ccfc2d1afac6eb448d31"; + sha256 = "04wwf92wrp5i17fwpbcj58d5i8dakqzw2d71wjg0lagqya8lbm4k"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2335,12 +2335,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2023-05-12"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "dca1949b0405c6ee5173d0627a523a10a63eca3c"; - sha256 = "1xcv5b0mgldn12dl4f772p638nmizvhngv1nlixdyaqcls618zfq"; + rev = "3648f8787656d7572740560331553abdaa8cb982"; + sha256 = "1acvfwm533sqalbgai16jir9cya0c6jzyiq8bsq2wk7xcgdm9ida"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2551,12 +2551,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2023-05-10"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "d5812635ac1ae87c0a7cb46e011fae93407ffa6b"; - sha256 = "08x2pwwpmhx6x889gffmjn8ajbyjr2izza5ys8p3d855srw6jk0m"; + rev = "632237abbc64118f1b11c896f3ee6f3bb3dd0c8e"; + sha256 = "12zcvzf6qshql8adq55fh9w6g81sb1jsvnzgph4ys4y7wyn8y0kz"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2841,12 +2841,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-05-12"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "1d6ea6ced1c3ec0f6464761a138bb35afd79ef63"; - sha256 = "14879zgf88zsgqxb3cd35am82mdz8b3ynylxbq30kv95790vl9z6"; + rev = "15861892ce62d8f4ab6e72bc4ff5b829f994430a"; + sha256 = "0cb57b05l1p6dqqirjbgagg2lrvfra72z5kjx0djvs14122n7lq0"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -3035,12 +3035,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2023-04-24"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "e6e3cbdc854dcd75a2f1a9648ab21103acb79c44"; - sha256 = "1hfzbdir1i5dzb5z170762z265df1grj7ynrza7ckv381qvw4riq"; + rev = "1db527e770deb8cbb3b5b60d8921f80bd2a4c12c"; + sha256 = "0jg53zzgv417v8c079cay11nwy8mi6v5svdslcl4iq84cr7l5qfq"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -3264,12 +3264,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-05-10"; + version = "2023-05-14"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "677e3837a8ea2645362d08f48279b7284117f9a0"; - sha256 = "0gcn8mp940nlps9jjx18nx1h1xzrpxi3nlak1yg7fwnkjlylashl"; + rev = "2b72017f369c5d80bb56bcf4379b3eccd69e2371"; + sha256 = "14incakb1ykyq8lr506wlzybpc2pyn345aajq7v83pwsc7lg5a9b"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3348,12 +3348,12 @@ final: prev: fuzzy-nvim = buildVimPluginFrom2Nix { pname = "fuzzy.nvim"; - version = "2022-11-15"; + version = "2023-05-15"; src = fetchFromGitHub { owner = "tzachar"; repo = "fuzzy.nvim"; - rev = "04b3d969002b5fd2db23a33aaf33a13a533cbdbd"; - sha256 = "15c3bymh1pm4d5h3ik9m7bz56ggrfzzbmh6sn5bkssmrazqphimk"; + rev = "67a42ad2fa6d5ff41f0ef3cf69bb247410da5d7a"; + sha256 = "1hkyvx98irnwqlsrpxsnfy3d289pvxpmgarkarakfkfhjw9nq2cq"; }; meta.homepage = "https://github.com/tzachar/fuzzy.nvim/"; }; @@ -3408,12 +3408,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-05-13"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "291082cda4a65a2f43d3a19219d63611decdd299"; - sha256 = "1kk68rm2bwd67s7h1nwyqqrq08kmhg4qd56ibpdl80yannh07kzr"; + rev = "7160a2062fa516fd3e526187e0c669aa6b770a5f"; + sha256 = "11dwx32fcskpz65q1yh9fa2lr0ys5xv1g0k0zb2zz0shsp6p07dv"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3504,12 +3504,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2023-05-10"; + version = "2023-05-16"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "37abc3436aef9b9fe37f38541fe096f8a42b8d4a"; - sha256 = "0wblaficmnxyq47cw6xicymhmvllpc54a57ay39n1p6ci4i79kfq"; + rev = "c165cde611f1e171c843eeac07bdf139d7aae2d3"; + sha256 = "1ljc2w51sm5ynj2n7jvggzig17b2qjizid6hkm7khgl6ps4r35gl"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3564,12 +3564,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-05-10"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "814158f6c4b1724c039fcefe79b0be72c9131c2d"; - sha256 = "1sa50871l86fx1hyrhb07i03r1sjlw76zp30csf846n24vnnnjrq"; + rev = "c18b7ca0b5b50596722f3a1572eb9b8eb520c0f1"; + sha256 = "1nghas0n89z0i5h4h3p4597zh20x4najax1vlzbs626cyd0rmwsw"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3815,24 +3815,24 @@ final: prev: harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2023-05-10"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "3476228be2d79f66ebbdb34eafc45842d054f7df"; - sha256 = "0z62l1n1z52b9yhs401nd581vj27m3zhf3r193r19id0qfi6v3ns"; + rev = "8cb54c4003045fe1b690de96638d334de9449546"; + sha256 = "0n1g3dbv5a090hqh0sadqla69dg8c5gh6q6zkjngg781jiw691gx"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; haskell-tools-nvim = buildNeovimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-05-07"; + version = "2023-05-14"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "ffd571921848eab27c2f61b92cc5ea4a500c4c29"; - sha256 = "1l56szk9skx9hlfm7qw4hi7m4lbq0ygzljwghiqahfj55wirwb10"; + rev = "f75225d30e1a122c70e713f7c4aa4da4c44b278f"; + sha256 = "0bnqx0d6kjsva0b1sk44lk067lwa9dh402xcinzpc3yd1xff08ga"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3875,12 +3875,12 @@ final: prev: heirline-nvim = buildVimPluginFrom2Nix { pname = "heirline.nvim"; - version = "2023-04-20"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "2aed06a3a04c877dc64834e9b9dabf6ad3491bc8"; - sha256 = "1sqhnhc749hm1bpy6s49w8jb3zpzj2azpj2hszn13ml1g1ps5iv7"; + rev = "2a151df2dc870e79b138a59ebaaaddf3d1b0d703"; + sha256 = "1sx2nl6w78m03n0aipv8v9r5w32zivx24ljfa6m00ni39acm0d1a"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; @@ -3946,12 +3946,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2022-10-30"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "90db1b2c61b820e230599a04fedcd2679e64bd07"; - sha256 = "18akjbplhp27di5l0bi9yd2haysgvw8yv3yk6cgwbizmk6inb5ji"; + rev = "03f0434869f1f38868618198b5f4f2ab6d39aef2"; + sha256 = "0f22abf4j3ncrs1ngp9p9m8wrhvpk9ckh76wapljvyblv9nwbn65"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -4427,12 +4427,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-05-13"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "aba872ec78ffe7f7367764ab0fff6f0170421fde"; - sha256 = "1pp2vfyznw7zcjm118xnsixggy68x5rl4i54z1i3ygxhssz3mysx"; + rev = "91564cb0a6d038d7e0eeaf68d505ed2627de625b"; + sha256 = "0haj80ic1v6aam3bahfijracjvxb38m7q0p9idzgcp52lk8ab2rm"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4487,12 +4487,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-04-28"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "6f2912755c9c4ae790abd829f0cf1b07c037b2a4"; - sha256 = "1xakvx3sxg2l23bqm2r08pcybvi7cx79602dxra0iprr05wg3xzk"; + rev = "2950d4826fb92ec3b56c59b5d4f2d575a84cb3fa"; + sha256 = "129bl09h8v96h5qnsmqn6j808gyb6yx9lzh49dqh5g20dk031yvz"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4559,24 +4559,24 @@ final: prev: lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2021-08-18"; + version = "2023-05-16"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "0b687d63afc771d5ddce3aa175b9ab4b012f9715"; - sha256 = "0nhvibvizczk8bp4lc4g9mndhwp240bh8adcq840zf3lghpnlkh4"; + rev = "b0fac72b5fc7592fe52458e45b77ff86919db014"; + sha256 = "1mlmi0xiaq2dyblv3qx82ka5ka1nghnw99jqkwy4r3dm4rs1b4a5"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2023-02-07"; + version = "2023-05-16"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "02764e0e87f85fa13e0d6a0e38ac6605f806d560"; - sha256 = "0d4hs4qh4fm393f1k6085l1f8yvqjpr2wdh7ia26k9839s4k2pn0"; + rev = "1f6d455be8181ca047cc1c4a980815f2d3c98fc4"; + sha256 = "0z0bsgab0n4qcrqbci9afdbqc05b7m3nilzv3b79j78nc9v70lgy"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -4859,11 +4859,11 @@ final: prev: lsp_lines-nvim = buildVimPluginFrom2Nix { pname = "lsp_lines.nvim"; - version = "2023-05-03"; + version = "2023-05-15"; src = fetchgit { url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - rev = "512d8c79637e7aeb889240c2e0ca8ae327940737"; - sha256 = "0j0wzb3g04f6i1mp8m9f1rzl71d2h1738ardw5swvr9p9x04m22p"; + rev = "f53af96d4789eef39a082dbcce078d2bfc384ece"; + sha256 = "11nsp21n1lhjl6m4mgj1vdcvalik9dmvv8baflzd2njb5g3gc5v6"; }; meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; }; @@ -4954,12 +4954,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-05-05"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "b4bc24c4925aeb05fd47d2ee9b24b7f73f5d7e32"; - sha256 = "0ymn7mwmzic58kpq5f4zmlskg2m1g9iqyjhlcqv8s8bba985yqp9"; + rev = "ec7fba1d119fb5090a901eb616145450ffb95e31"; + sha256 = "197frj7iinil9drqs95dz6ddzgghq9fx18d2ky3pivnqh3j5wik8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5051,12 +5051,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-05-08"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "90a8bbf106b85b76951a34c542058ffa807de2b1"; - sha256 = "0gwm937hjc8x184zxdajrfvbjjn64n06li4g4iqqjzlypgpy8ild"; + rev = "c55d18f3947562e699d34d89681edbf9f0e250d3"; + sha256 = "0xv9q1n9r44xxd1ninjq62wkq3d4v6r83863mlxss2hlb2lrfymj"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5075,12 +5075,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-05-12"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "e634134312bb936f472468a401c9cae6485ab54b"; - sha256 = "1v5alysyc7qbmzp96wlr3wfffh7l8z6r01a14s944gy1sh2whjzb"; + rev = "08b2fd308e0107eab9f0b59d570b69089fd0b522"; + sha256 = "1z0vr1wmyd26xw57szng8n6hrdn25jj5qn5qf22bynplc86b3jdv"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5159,12 +5159,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-05-12"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "50ade2218c2ad32b1c6421ea500adaad01fa476f"; - sha256 = "0bfkfhn9zxcd0dfxfhsi5d9zf2qwk2qnmpc0h61mqm91xvznzahn"; + rev = "b3cea506e02226cefbc6bc9ff01175a95c525506"; + sha256 = "00pbwb1ds4cmf414jfwysx279gaa1wjh1qkhmmjv7phh0nm7ncl0"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5229,6 +5229,18 @@ final: prev: meta.homepage = "https://github.com/tomasr/molokai/"; }; + monokai-pro-nvim = buildVimPluginFrom2Nix { + pname = "monokai-pro.nvim"; + version = "2023-05-13"; + src = fetchFromGitHub { + owner = "loctvl842"; + repo = "monokai-pro.nvim"; + rev = "e7b38bdb95fc144456703bb0ff5692c68093cc8e"; + sha256 = "0wmc8mfwzgp77jbg8yvdcv5z6zn6fqrp1vwz2gf3iyc1k5vp9p49"; + }; + meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; + }; + moonscript-vim = buildVimPluginFrom2Nix { pname = "moonscript-vim"; version = "2016-11-22"; @@ -5483,48 +5495,48 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2023-01-10"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "6c581808ac3179ea0c640e43c77de48bbbec4fbc"; - sha256 = "0jad8phdvslv57mah0psp0xlvh116s2dwmh7v1g4kmk598j4ljm4"; + rev = "4ecb82f2821d2ebee0dec56f04c223ddc3b26d82"; + sha256 = "07k5rp0abgfdrayf1h4xc49nr4l8bbb0r40s5a8vinaz54i4fy9r"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2023-05-09"; + version = "2023-05-13"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "541f5c92d2492041afb354e2df6e74809094b051"; - sha256 = "1dqq9vzsz6d247cfm50v4i5xja7kl7gx8574gny483c3bkhyh3l6"; + rev = "e5594d53986b34e584e8afe2ea6ad99d6f6d2105"; + sha256 = "0ada22l0kd5rgsh0j1kk9qws8cvpprlq8yrxgmbkwzqn6z0j9zak"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; neocomplete-vim = buildVimPluginFrom2Nix { pname = "neocomplete.vim"; - version = "2021-02-18"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "neocomplete.vim"; - rev = "fc2d22c23962290cc0b32f50bf18add6a4573bdf"; - sha256 = "04sxri3anr5d8zdqw11fn8nqf86wxin4lza78dp2x52kgrjawpla"; + rev = "9ab6313277175db7940f79d9ded5ef7d5979d8c1"; + sha256 = "0d09n689067v96k0bwn9wwdjvj9s4khfvv5jpibdwnykgv9jbm5w"; }; meta.homepage = "https://github.com/Shougo/neocomplete.vim/"; }; neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-05-13"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "65c575105bff285f502c746c2c7388035cf42b10"; - sha256 = "123vm8bjgs70w125n7xcdas7dpn4z3a9i2wj38s62isdj1x5ajw9"; + rev = "bbf98ce53481e6e8d6507de5a6f18d3264fb0df7"; + sha256 = "04nz3cya45gmddq6r24hqziiisf5a3szbak2pzhf56qfpnsr2zsd"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5543,12 +5555,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-05-13"; + version = "2023-05-15"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "7c6999ba7d8fdf36991b0aeed034b0cb299ce1eb"; - sha256 = "1dsk0v86m47yrip2l6z1r5ykrykrv225h4jx209ykbk3ak1s3h7a"; + rev = "0c5d6c2ac2fadebedf08282d9403ef6c3dc31896"; + sha256 = "03nh76d9ks6cpmdh6saa6wgb4920didnapp0ww6w6vw7wpqkajng"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5579,12 +5591,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-05-08"; + version = "2023-05-15"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "917fb24c9b7e0506ebfa94ccdbeaaea5eff2f916"; - sha256 = "1554jri0cydga475vg3ink1cd9lc7pjx9akq0lds4fmwcrdq08zh"; + rev = "5ea830c42d833bf425ec669abe2fb649afc6fc7c"; + sha256 = "0y8pn2vdskd5jhdich44dr5qpdpp360zilqyqlhaqwji8xpb2c68"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5639,12 +5651,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-05-12"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "4f5448c88f1a09bd7a4dddcfef3b2148619e7280"; - sha256 = "04d7v4rvc4jml3lhl9vbfwqn7qj53bwzgqxabk2h0jw2vz9nvx9z"; + rev = "238152ab40ec1fb293fae75744942146876ed08f"; + sha256 = "1ysfdfwfi85391v3drkzqq4cfwi7axcpysw2vdavns3gcbdy4a04"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5699,12 +5711,12 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-05-13"; + version = "2023-05-15"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "42cf226457c61abe6fca081e959d69e2325cf08f"; - sha256 = "0gl419w8cmiqh6s25f242nsc3c4i9yd292vicwfn5ha4c2yq6pm8"; + rev = "6435a367a57f267039c4c69a723cec09ae61b17e"; + sha256 = "0vq59v4qjq9g0yzzn6b66753fz4ds492ym1d7kypqq4fa0ricl9c"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -5771,12 +5783,12 @@ final: prev: neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-05-07"; + version = "2023-05-14"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "ad63bf92d64ab580fbdd3d9e4481bf58dc62f44d"; - sha256 = "1v9nz1z3a1pd8s6bwrz89rrlwx9sqzj5kvqx6jar0qqllmws1kii"; + rev = "15970b4fbabb74ba97022f0cc35dbf72fabc4c59"; + sha256 = "1s1l6bahba1xywav6fr4517i85sbx4fzdxl1xpj1nzr6pqmhxjd4"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -5951,12 +5963,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2023-05-08"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "277bdfc6796479639b4c580d2089e2a34962cd1f"; - sha256 = "1dg9jibmcsjfnb3ahzs2vdmiyzgphjslbrsc128d9sll7w0baq0j"; + rev = "20452116894a6a79f01a1e95d98f02cf085e9bd6"; + sha256 = "0myc7s0q4a5y113y8sn4lhg706v5dv4815p64qk6ssy7j16866i7"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -6071,12 +6083,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-05-13"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "39e56a3cc0e7e934b7ebbcfa775b386919f87256"; - sha256 = "1qyby5d4j4vp7wl0s7fxczfwmkk197i8m6mxc9m5rg59ipwr35fv"; + rev = "3b16ff8ef300aad3a1f93f0abc08b6ec0873af96"; + sha256 = "0rjf3sb3jki44ll3mnwppvrdqxiyrv8yg7c1gsvazld9rqichd6s"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -6179,12 +6191,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-05-10"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "08bb00c7c2cd58c72e02cf54e4b9cbfe14b03e09"; - sha256 = "0ygzm25cpcnkspqby07xb95p459wfd56ll5hrk6czj70qp552f1d"; + rev = "77e53bc3bac34cc273be8ed9eb9ab78bcf67fa48"; + sha256 = "1h3nnci4y33ih4isss5sdd1c2fkjvmn58l01fpnmcqmr9rhqhwaq"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -6201,6 +6213,18 @@ final: prev: meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; + nvchad = buildVimPluginFrom2Nix { + pname = "nvchad"; + version = "2023-05-18"; + src = fetchFromGitHub { + owner = "nvchad"; + repo = "nvchad"; + rev = "262a06776aa731ad89369394f73320461d4a7e63"; + sha256 = "1nfa1sikdrmjq8v64jsvbrfgap1dmlx8pvvpspxs4rz3i0y3scfv"; + }; + meta.homepage = "https://github.com/nvchad/nvchad/"; + }; + nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes.vim"; version = "2021-07-03"; @@ -6213,42 +6237,6 @@ final: prev: meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; - nvchad = buildVimPluginFrom2Nix { - pname = "nvchad"; - version = "unstable-2023-05-18"; - src = fetchFromGitHub { - owner = "nvchad"; - repo = "nvchad"; - rev = "262a06776aa731ad89369394f73320461d4a7e63"; - sha256 = "1nfa1sikdrmjq8v64jsvbrfgap1dmlx8pvvpspxs4rz3i0y3scfv"; - }; - meta.homepage = "https://github.com/nvchad/nvchad/"; - }; - - nvchad-extensions = buildVimPluginFrom2Nix { - pname = "nvchad-extensions"; - version = "unstable-2023-05-14"; - src = fetchFromGitHub { - owner = "nvchad"; - repo = "extensions"; - rev = "6025bdbbac5c14b96ba4734e61eaf28db2742676"; - sha256 = "1dfj4a3vh8djgylcc4f7bg7hq2mmg8imizglzbqr0my74v4shd1w"; - }; - meta.homepage = "https://github.com/nvchad/extensions/"; - }; - - nvchad-ui = buildVimPluginFrom2Nix { - pname = "nvchad-ui"; - version = "unstable-2023-05-18"; - src = fetchFromGitHub { - owner = "nvchad"; - repo = "ui"; - rev = "168ca134ae186ad977872bff3301378c0af5be71"; - sha256 = "0xwvgbv7xj1ja7fgw14vnm083hab6q19rihv8nky93wj5v5xjkya"; - }; - meta.homepage = "https://github.com/nvchad/ui/"; - }; - nvim-FeMaco-lua = buildVimPluginFrom2Nix { pname = "nvim-FeMaco.lua"; version = "2023-04-20"; @@ -6347,12 +6335,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2023-05-12"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "d153771162bd9795d9f7142df5c674b61066a585"; - sha256 = "05xiyakckdc7185amr3fxr0wjsvdr94pah4wgnn0ysmzsh0smc3k"; + rev = "3ac8d6cd29c74ff482d8ea47d45e5081bfc3f5ad"; + sha256 = "16hg3yijmdpnk8rh9410y9xf1bns4jbcghc9q92pqj4q68bq9zp7"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -6455,24 +6443,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-04-21"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "6cedcb527e264c8f25e86afa8dae74c6692dee51"; - sha256 = "1vapds2p17k3h4llh0p6mxk4qrdik8sjp09l7fnl1mwnybl0k6wp"; + rev = "56118cee6af15cb9ddba9d080880949d8eeb0c9f"; + sha256 = "12byna7q3c72gij51lnyvgmibmxbw0xdswk6zny6p58b9hk4b3w9"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPluginFrom2Nix { pname = "nvim-dap-go"; - version = "2023-02-08"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "b4ded7de579b4e2a85c203388233b54bf1028816"; - sha256 = "188w0n42gzvc4c1j6i5i48j60zxx9lrc3nq2z8ly0m7l6lc88vx9"; + rev = "279225336d5044ad8cfe95ec55d91a3b03fc6e9b"; + sha256 = "0iz3mn3s1ybz6h44q5i339c2zagfsjv6m7d7lg2vdfqly38y8lic"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; @@ -6587,12 +6575,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-05-12"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "30f9f797f1a24229e3614d063498ab24effcab1c"; - sha256 = "1jipzfqf0ryz731bv0ainxafzgxx0kcs2v04qm7lc3mjsgw1hbd5"; + rev = "21cc97ea72b5271f9ec9779c765dcbdaa7ea6a83"; + sha256 = "04347wdx93igdgkg2kz5qy3b7yyhcl3qyfvdcbgb9832brsmhfmh"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6707,12 +6695,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-05-12"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "df58d91c9351a9dc5be6cf8d54f49ab0d9a64e73"; - sha256 = "1jg6pqypw3pj6s9nxq6kh1r5mwxrgap79s5382a73xx0rwf4kkvp"; + rev = "6f1d124bbcf03c4c410c093143a86415f46d16a0"; + sha256 = "0ks7565sh91ydc8w5n2b2dlikmxfr0q5jmf6gn776b3knflsqk19"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6767,12 +6755,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2023-05-10"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "93265711012dcffc07f668a36ada59e73beee362"; - sha256 = "0mijbkaqjznm4limd5v28q09lyvqc268f3ip4c1gck4v0jwrdja6"; + rev = "fe5a6294efc9aadab905413486995bc8226f98fd"; + sha256 = "0iyjj4gcxd077qdw6g8y5iy4z9hii0ddwz2y5p560jxpzzab54dd"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -6803,12 +6791,12 @@ final: prev: nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2023-04-25"; + version = "2023-05-16"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "591f1b62343efe3e369e4831cd91e1875f3a08f4"; - sha256 = "17v2c7vmnj7lxngvc039ih6d0mihhjcy4bfhrm2l67j7sylybdcr"; + rev = "4e406ae0f759262518731538f2585abb9d269bac"; + sha256 = "0iz5jhzgmajg30cf49n9r0mryxag0dybbfgl231z9v421hr3187p"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -6851,12 +6839,12 @@ final: prev: nvim-osc52 = buildVimPluginFrom2Nix { pname = "nvim-osc52"; - version = "2023-05-11"; + version = "2023-05-15"; src = fetchFromGitHub { owner = "ojroques"; repo = "nvim-osc52"; - rev = "fa9bbb319239fa54c1b91b84c1d368d3c6427ffd"; - sha256 = "0w5w3zxgwdys7i5sl6l8mykjfgillsdc73d3xq6w6rzscslvlm1p"; + rev = "3e96035d62290183fe7a11418db2b254fcfcaee3"; + sha256 = "12zdrwjlrvzlpwqi757llfvr7ir6ww949i85da385n2crj3jfd8i"; }; meta.homepage = "https://github.com/ojroques/nvim-osc52/"; }; @@ -6911,12 +6899,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2023-05-11"; + version = "2023-05-15"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "e6482a99bca307b0418c91dc5c78345ec236dbbe"; - sha256 = "1i8gh5gk0i32ncf9j827qawcvnm0cwnqmqkvmw3q2ws987qqz594"; + rev = "7b50933b44ebefc85bf1734eadc4fcfcbbc781c7"; + sha256 = "0pgwr8c3qkrg5zjyy0i99yclh7s2fbinr2nkwi3w2i9i6q04jmcx"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -6947,12 +6935,12 @@ final: prev: nvim-spider = buildVimPluginFrom2Nix { pname = "nvim-spider"; - version = "2023-04-12"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "23fa1260be2090f2d675ee90e0b83fd993f6c3dc"; - sha256 = "1ij9kv1dm6lrdvrw83wc833yw32k4wdgqg1gd5d4qdddnqhix6zw"; + rev = "1aa7054a1b8b7c3605839603c6015c8c7446d8a2"; + sha256 = "15y3hw7y081y2h73nmanldvmfa0sdsyis7vjm4bb354qfpqr9ld0"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; @@ -6995,36 +6983,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-05-13"; + version = "2023-05-15"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "498e8793bbe73ab5235b3ee8f0aee32f5d01649f"; - sha256 = "0v80ydxidfz01q336lpxnngrg3c790zjnjlaazc7k66gzgza800k"; + rev = "736c7ff59065275f0483af4b7f07a9bc41449ad0"; + sha256 = "0g9zl6lqnf06r0fkp2b2f63l806vgplmb64n608rcbc9j3iflhw3"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-05-13"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "680807fa6a482c639119098bc48ca3831c66db13"; - sha256 = "0kh1i38fppg93vg87wzn2jaw3wwajnrzyc61c1icwvl2y91nhxns"; + rev = "dad1b7cd6606ffaa5c283ba73d707b4741a5f445"; + sha256 = "1zvwwgyid84nl37504kl0rj6ihzq8rpy86d0gq6pxzdn65z3xfay"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-05-12"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "f24a86c32238867f24fbff49913db0068f8488d2"; - sha256 = "09sj9087i6waqq4cr6z8m1di491wq21m8fkwrk8hs590j52j0pv5"; + rev = "c8f3a62c64bf6f9fed11260a424207f780505f83"; + sha256 = "080039y37h0xdx541h16xbdqdy9767wf4r210j6c7g7pjwcz2532"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7115,11 +7103,11 @@ final: prev: nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-04-25"; + version = "2023-05-14"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "1ffe68cdd594633dfee0762feebfef81ed6f1fbb"; - sha256 = "01qlrz7s681s0hl2ygg6qq7ysqr1yxz7y512f647mviv7c7aw3qy"; + rev = "a1e460f126db0bc3dc9e0cbad157e5671ffd2046"; + sha256 = "0dxginbs2q8p2wfqi3rl6zs9zi1arbdb2kcqbljxcfs1ia36x3qr"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; @@ -7198,7 +7186,7 @@ final: prev: nvterm = buildVimPluginFrom2Nix { pname = "nvterm"; - version = "unstable-2023-05-05"; + version = "2023-05-05"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvterm"; @@ -7246,12 +7234,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-05-07"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "d0efcc0c10cde11fd650a4ca399539e6f8f9f956"; - sha256 = "1s7cr9cq7dm8ld78fz8f8dxr32cfcbki8gk8ri55s0j13f3vdxj4"; + rev = "19563c365800ab519e46a08a0aa59d5677b329b6"; + sha256 = "0ymbd7cyix0yhbzsb3k7509f22sy04jkcbzkclpyf63a971vh87q"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7391,12 +7379,12 @@ final: prev: oxocarbon-nvim = buildVimPluginFrom2Nix { pname = "oxocarbon.nvim"; - version = "2023-05-08"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "91fdca604c34af4e85e8cd7c3ab08724c86565cd"; - sha256 = "1aqxkz6zlr7xvgw641wg5i451ff7m0g700wvg5132ipa3s0ndw16"; + rev = "ee9182cb01c833369fd492ecdfb12366ba75582d"; + sha256 = "1mlip0q38szvyrsb6p6fminbfk7fcmgjdlrmsafzr2pmspbcrz8v"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; @@ -7861,12 +7849,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2023-04-25"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "47a1716a9020c0093a1c8af36c3f9434dae62bbd"; - sha256 = "12pbz5m42capc841x89bin9kinck4ysycks7pyj2zg8z8yb9xp5f"; + rev = "6d2b06e5d46f08ad928c06c0e4a87e06f71e8d0f"; + sha256 = "1mjr17iz1fwd4kiqr9z7nny8vdirsiyzijx1fdh0j4qvql89842s"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -8873,12 +8861,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2023-05-06"; + version = "2023-05-16"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "4054a5d0ab85475bf75df00cf10754d2e54b5532"; - sha256 = "0nz9x2ls3pfp2pcmh91dxb6j0mq2njm1nxmxmallry5w1hsvvmw2"; + rev = "1aa7f12ce797bb5b548c96f38b2c93911e97c543"; + sha256 = "1br20pnkr0nvi7xkx5r5ffz9dr3r8y3qwhr3bpsbm8cw2s4z2kx4"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -9103,12 +9091,12 @@ final: prev: telescope-nvim = buildNeovimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2023-05-07"; + version = "2023-05-16"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "d77b37f4520e5fc2cf4c74c12e42ed4b589bd367"; - sha256 = "01i1dmlnx2303bv8ahgkmks8jsgz4frb6dxcqxh9xk1acsqzbi7c"; + rev = "40c31fdde93bcd85aeb3447bb3e2a3208395a868"; + sha256 = "031l1kdny2l9g9mh59h8pskpmj2ps1p7p8ypk1dymkk30a1a9vw5"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -9356,12 +9344,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-04-24"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "68fdf851c2b7901a7065ff129b77d3483419ddce"; - sha256 = "04lphxnwzlsacszdikzwipm8wycwzi0zyz1lvpqplpk6vrfbb58v"; + rev = "26f16d3bab1761d0d11117a8e431faba11a1b865"; + sha256 = "0yk1w6fh3misj5hds6wfs4a0yxlijxyppcv9rph5f7nd9dbayin5"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -9440,12 +9428,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-04-18"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "d56bfc0c501ced4002a57cb60433362fb2ce9c4d"; - sha256 = "0h01raxxjq2arkjq0wa1l5nhgr2x55rmmq7hwz46sl4il936yvli"; + rev = "2173dffe91fc0914b3b833c6a2f6fe1d3fac2e17"; + sha256 = "0xk3ymk3kl7l8rlxicqfg58hx8i8dh5lglp5r9573y52svj3g5ai"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -9560,24 +9548,24 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-05-12"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "d5f0f0ec7652468993d578c040024aff6805b89d"; - sha256 = "1w5mz351jyzh5rj0c51qj7s6wk71z3qrlxzw0rx8n67w2c9am216"; + rev = "2aa0a981f41b1021f58c525f952042459994a4f2"; + sha256 = "132rs8afdvglsbmv0jh3ylzhnvkfvjy519npw2x1xaya244hg5dj"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; unite-vim = buildVimPluginFrom2Nix { pname = "unite.vim"; - version = "2021-02-06"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "b08814362624ded3b462addba4711647879ca308"; - sha256 = "0hk5xhn9zfas074hgv0y6lbc1jyj5kqjg4zdix8am3s97aqr96ms"; + rev = "0ccb3f7988d61a9a86525374be97360bd20db6bc"; + sha256 = "0zd165b0fmbpjfn0v8pq01hyy2w3szlrd7jksymi3k9sjmlw79lw"; }; meta.homepage = "https://github.com/Shougo/unite.vim/"; }; @@ -9656,24 +9644,24 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-05-12"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "2d2978cde9f10d4e82700720e0ea2150d4f1ab74"; - sha256 = "0h8cxcbv69jln74zz7mfpp4cm6f4yyj9clrlmsmpzrqk5pphl8fb"; + rev = "9241d3bbbc692b52cf61c0a464e66b4a9cf5418d"; + sha256 = "08fprf2cyi9jkbpvjbfcsxczzd3c8f5zkpivj1cwbyj2v9j6862w"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; vim-CtrlXA = buildVimPluginFrom2Nix { pname = "vim-CtrlXA"; - version = "2021-08-09"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "Konfekt"; repo = "vim-CtrlXA"; - rev = "404ea1e055921db5679b3734108d72850d6faa76"; - sha256 = "10bgyqnwcqly3sxl27np1b690hnj1snqbcvg8pzh4zgdysfgy9xg"; + rev = "6821041f17848c02bd3c0ed13422d6ee6422a6a4"; + sha256 = "0qjv7bkm6gvfisas7cq41dg6fffdnqzyidikfjhab2hzgvslb7kh"; }; meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/"; }; @@ -10448,12 +10436,12 @@ final: prev: vim-code-dark = buildVimPluginFrom2Nix { pname = "vim-code-dark"; - version = "2023-03-26"; + version = "2023-05-14"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "7bf26b5432ca93309d08037b27fa9459e64a460c"; - sha256 = "0izvr4x6lx05p97xk03bhmnjna1nhy4vbx18x5z05a96idwh0lpi"; + rev = "5c2c2d65ff908f4763c6af1cf3f100ab9a426e9e"; + sha256 = "1jya6w6saxk65mbnbln7fwmj6d3r11x8x9gd3h5q41idz334bjnc"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; @@ -10676,12 +10664,12 @@ final: prev: vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2023-05-13"; + version = "2023-05-16"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "5f6a11d80128e05fcc8e5d5025b8acf6d77faa99"; - sha256 = "1w245ag92xb081bpr9pi1ii64fs659p9d6k6cy5ab5padznhmdj9"; + rev = "36a67e67926345c0b11b32c378c057c7f9d9110d"; + sha256 = "1brkv29msx0px9hx94w8296wy9fn3i2zcxihr7gnnkx3923a5h0q"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -11120,12 +11108,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2023-05-10"; + version = "2023-05-14"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "59c1fd5b0097014bdd107121612a30c556b67de0"; - sha256 = "1na1vxl3l14c3ngz3cgxhn9ajsfxkfwzzwpr2bpmxm9g5mki4kf5"; + rev = "bd0aee3c861d613f56b85bd9eaffdcab459071fd"; + sha256 = "08jnirzgqjj17l6nhr9wdp6zvi280pmdb762c8sz1i77fkb0vpm3"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -11336,12 +11324,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-04-02"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "a494378f6c106a97e39c62b493c14476f9f7de4f"; - sha256 = "1dwjmqhgjq3vlc2sikbvhvchfffzjpdih1w70mrmb43zcns53jlz"; + rev = "2a874910a242fd4a5da021ea32fb1cde3b69f79b"; + sha256 = "1n5xs00xd7wkivxb3jfxrspplbs67kqg0lx54p3mclaasjia07ai"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -12082,12 +12070,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2023-05-04"; + version = "2023-05-15"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "6017a30e8ac75774be8cdae7bd996efbc9c1598b"; - sha256 = "1p4a081x4vfy3rli5n4a4mmnykq0lpx38qhkkgbnc7fvw92x2468"; + rev = "e74bd3c986484845a4b87e5aa013773d52030a75"; + sha256 = "0r2g34wzwg80qbppyhrxkv0h1rpsmz93g651j3j65slq2c26qg04"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -12118,12 +12106,12 @@ final: prev: vim-lsp-settings = buildVimPluginFrom2Nix { pname = "vim-lsp-settings"; - version = "2023-05-05"; + version = "2023-05-16"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "af35b04c2d6c12fd2350a18757f3d08830886eb1"; - sha256 = "1givbnmg8w72cfg359hqn8lcxqdnk2rplnxbb5yd3g66wbqvfq38"; + rev = "63d1d3108e7f401c6b20257ab8a61602938ff73b"; + sha256 = "0kp0fz0bq559r4ia6r55y8gr5n5w92p9if4hcnvvfrsijj563iqb"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -12239,12 +12227,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2023-05-07"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "6c8909b682803d8c3a054259079f158a73a0e30f"; - sha256 = "0w6p1kpggb5hl5h7zz5s873dysdvhdn229dpl5m66g4c5j66plj1"; + rev = "b8eca3b588e41e0bb1b3ae200fae88183b91a76d"; + sha256 = "03vwwszjrirrlnvh2gk95p31ps9ylhz6hms7g4by3rvab90av7p2"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -13463,12 +13451,12 @@ final: prev: vim-smt2 = buildVimPluginFrom2Nix { pname = "vim-smt2"; - version = "2022-03-08"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "bohlender"; repo = "vim-smt2"; - rev = "b9e4cbb85e880cd32f90c2dd9853ee7c592b3528"; - sha256 = "12g2ia7yqsh98nlr4z0ij67x0xamgizv0gbmg221if7ycn222xlm"; + rev = "58a67a0ae14ba2d72c683630c1275edfece625ec"; + sha256 = "01nkjvmaygcv2am0qp9985l2qwkal5c6k31zrpjrhdp99py6c117"; }; meta.homepage = "https://github.com/bohlender/vim-smt2/"; }; @@ -13583,12 +13571,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2023-04-24"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "01b67169c3ebe41f163c07bf6853555ca19bc27f"; - sha256 = "1rbmri63v3wmx841pzncjqsw495dlwc0m0p4nr2r9mg4ccpq2xqm"; + rev = "5ddaf24df23f4d151970987c1322eaa247f08e69"; + sha256 = "0w2igyqfwn3zfwpn3m5ki5bzyjh4161wfgx4yvn0blywjp525vbi"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -13764,12 +13752,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2023-05-02"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "c19be85a9b3d8b86f37533bfeb82cbe189cd895e"; - sha256 = "16216q8d0dd10i84sh5v5p6bmvfbw86sh7zd7k0fwbaa6yfbpk2v"; + rev = "08250c56f11cb3460c8a02c8fdb80c8d39c92173"; + sha256 = "19zd8ngmy1aia7myzgn8j6707jcxs27zmy9gc2fxsrhpq7hgnyfm"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -14424,12 +14412,12 @@ final: prev: vimfiler-vim = buildVimPluginFrom2Nix { pname = "vimfiler.vim"; - version = "2020-07-13"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimfiler.vim"; - rev = "0fdf9f2f7e6014a49625433058c1665f72a3b86f"; - sha256 = "028hcmr7xxqmb55m9q2h2x9kr5xq5866ivr0in23jm44s897yr25"; + rev = "1c1d2b4f9e70c0b48bcf11bf51c482b8a2d776a8"; + sha256 = "136rlz18dx7m8k1sdq3r7pww5dipkzq7b21figh03fmcvrrdk74w"; }; meta.homepage = "https://github.com/Shougo/vimfiler.vim/"; }; @@ -14509,12 +14497,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-05-03"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "18255a2370812696138cb415a5b02925d33ef569"; - sha256 = "1m9c499n34xlr6vjrb6zqgwj6g1j39xxdwl9c4f6biamraxix365"; + rev = "e9ad2be22855523f95f564302e72e2ef3d1f2386"; + sha256 = "0bpbfkl1v4ckkn5rshfxd2drf827vjgj8r9pviz7rbxq0z8fxd7p"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -14581,12 +14569,12 @@ final: prev: vista-vim = buildVimPluginFrom2Nix { pname = "vista.vim"; - version = "2023-05-05"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "522a5e0ef955c037d530d5c89944043c92e4e8da"; - sha256 = "0g9vjji4760824q7w0ik89b1wrq0k0rv54c3wmpxk9hxfd34wlb1"; + rev = "f925e481bba7cd5451fb8bca9a6ecfc2bf1f2858"; + sha256 = "1gnqiyg2ifnna3x99bmkk0fsa7mkhnhjzzrz42lzvznn11bn45v8"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -14653,24 +14641,24 @@ final: prev: wiki-ft-vim = buildVimPluginFrom2Nix { pname = "wiki-ft.vim"; - version = "2023-05-10"; + version = "2023-05-14"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki-ft.vim"; - rev = "0c5ee681307a3ecb638b32097b2aba373cc5d3cb"; - sha256 = "1gbbny8qhrwfsiaf28ys478vb0pka84cm13q507lxb8lbwwg6c9g"; + rev = "d547e58dc7e6cf144e1d490a243b0788dd37104f"; + sha256 = "1v6ra526m720njw1qbvmmw63mv58mjr0fkzq5gdiivrhk8kfg4zw"; }; meta.homepage = "https://github.com/lervag/wiki-ft.vim/"; }; wiki-vim = buildVimPluginFrom2Nix { pname = "wiki.vim"; - version = "2023-05-10"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "6ba29dbfdba56315829b06d8bafba71f07bf9fe5"; - sha256 = "1x223ly4jilvpx81ipjdls45nlvfwbm2sf74q535775r09g3wrv6"; + rev = "6997fc624b4e01bcce35e0b7bbbc951de0b1c0aa"; + sha256 = "18hp9bwxlacx0b1bscwhab5snxyca1fq87xvs8dqk9fmn83n2s2m"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -14942,12 +14930,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-05-10"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "57b421ee5f7380f816791fa451e86f213b625ece"; - sha256 = "1hbrfldkmiqva46a4i3ma74hkgnlsm6ry2yaglh504vcfzrqviwq"; + rev = "8338b02e9a8ffcb999520de7f15943712618760f"; + sha256 = "0yxachyinpnj145wzy74ahy995pkv0ik5h47dh25fs33sivabdq0"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -14966,12 +14954,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-05-07"; + version = "2023-05-14"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "34395cb227fc48186d5481e68050b0727ea3bba9"; - sha256 = "0wj73v73zs09008344dlnq0f2nn4r9c7szg552fmyz81ks3srnj8"; + rev = "e38e4a51399d50c757572125813fbbcb2f1d1813"; + sha256 = "0bica77v6vs6kqdj26hr2z206267k4qdp1ywg150d5gbn6mr65xs"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -15014,12 +15002,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-05-13"; + version = "2023-05-19"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "7d36cc2fbb803011c69852c2dceb4b056ad6fd9a"; - sha256 = "0sfap365v3amdr3mqn6mw1asvjpqnbwbkm6ifhlfphr7a805jl6r"; + rev = "01b9633aefd010f272d6c7e3d8293c44fcfe7696"; + sha256 = "1gxfkdiqcjsqykkkq0xmbsif9x6qs22zjx9fv17ac0yky8fg8d0i"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -15048,6 +15036,30 @@ final: prev: meta.homepage = "https://github.com/nordtheme/vim/"; }; + nvchad-extensions = buildVimPluginFrom2Nix { + pname = "nvchad-extensions"; + version = "2023-05-14"; + src = fetchFromGitHub { + owner = "nvchad"; + repo = "extensions"; + rev = "6025bdbbac5c14b96ba4734e61eaf28db2742676"; + sha256 = "1dfj4a3vh8djgylcc4f7bg7hq2mmg8imizglzbqr0my74v4shd1w"; + }; + meta.homepage = "https://github.com/nvchad/extensions/"; + }; + + nvchad-ui = buildVimPluginFrom2Nix { + pname = "nvchad-ui"; + version = "2023-05-18"; + src = fetchFromGitHub { + owner = "nvchad"; + repo = "ui"; + rev = "168ca134ae186ad977872bff3301378c0af5be71"; + sha256 = "0xwvgbv7xj1ja7fgw14vnm083hab6q19rihv8nky93wj5v5xjkya"; + }; + meta.homepage = "https://github.com/nvchad/ui/"; + }; + pure-lua = buildVimPluginFrom2Nix { pname = "pure-lua"; version = "2021-05-16"; From 3c4cd24030622e64173a81a148ea07ee04b80abf Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 19 May 2023 17:11:47 -0400 Subject: [PATCH 06/51] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 88 ++++++++++++------- 1 file changed, 55 insertions(+), 33 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index f3311dc2ec3f..8073e76f3c7c 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -126,23 +126,23 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=735716c"; + version = "0.0.0+rev=424d014"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "735716c926837d9e39e4effb3fdc28cee81a7e5e"; - hash = "sha256-7EBhWdRchk0K1+ofn+nHa/VZ8eWDM9cpPu1QUwpvidw="; + rev = "424d0145efb0a87927269ab47709f98a564f8c4f"; + hash = "sha256-cj8aEcdO5rsie9CqT8GLfvJm6O7yqBQPtn5aDe/lVpI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=7611471"; + version = "0.0.0+rev=aaafc3d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "76114711aedd3f4b6e1333a7513975647930c629"; - hash = "sha256-sBpI/8SfIzPQ0aJ8tw00IZoWGFnBo6mvRcn1lKfnaTg="; + rev = "aaafc3d75f058ca5fe639b7ed5829964a3ca4575"; + hash = "sha256-rKP6KfNCkytcAXHVv3EtOQEuhY+dxawFEFQr7kjuA6I="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -292,12 +292,12 @@ }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=939e5e1"; + version = "0.0.0+rev=8aa8ab9"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "939e5e18321a695f39889ae9dcf3c0255a107109"; - hash = "sha256-1zOxekwG+wM0Fkr2LMqCHf5twlNfJyN9Ozb98bkq/+k="; + rev = "8aa8ab977647da2d4dcfb8c4726341bee26fbce4"; + hash = "sha256-62Mwn1PnGxVWST396vX/aRkNgzloq3H23TOPZ4oqqiM="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; @@ -436,12 +436,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=7d083ca"; + version = "0.0.0+rev=13a6a51"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "7d083ca431265a6a677c10e8ca68a908ab0c2bc8"; - hash = "sha256-W08JXLPIjUBfHSaTEGbIKPStQr4jOVE1f9osjrWG82Q="; + rev = "13a6a51d1bda845f756971773dd6049b80a3cffc"; + hash = "sha256-xy4/AZPHv9V0gzLRXOmUcFyKzLDCgOyqBH8HNYE8GRk="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -579,12 +579,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=735f02b"; + version = "0.0.0+rev=6c14f8b"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "735f02b12d9cdd9a8b90ac4b2dff8cdab6dd1e7b"; - hash = "sha256-uWePpMTJNiR7uh9LpmSiIQUHNiVDF8i32nckPKBFH3g="; + rev = "6c14f8b63767cf6264c5c43ec71cc9351420e831"; + hash = "sha256-x5FNXZ+/AexfXn92xSRIdKQGAepvAnMmAz/013x1Q7U="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -623,12 +623,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=f21fc83"; + version = "0.0.0+rev=7a00509"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "f21fc834ee48cc485c85f5df7099e00058dbc180"; - hash = "sha256-1G0oiIOPVDCeWej6CwMQUvf53Rq2ZIFgz6ucQs1AZ+U="; + rev = "7a005091d3896dab80f34d8dba58935ad7ad6353"; + hash = "sha256-L8FbCXea2cQ9Gyh8xtETynRKCt03TAXH0yM3XJTrGMY="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -766,12 +766,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=9160427"; + version = "0.0.0+rev=cad6130"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "916042734060d3d3a023f6637c815a1d23814af8"; - hash = "sha256-FGOXqBmQXCK2G1iseYgc7CdMOQ7P9dVG7ZHEsqcnRhk="; + rev = "cad6130182be8793ca5ef00a8581508e2f12f642"; + hash = "sha256-gTek2joY9bhkFYXOxE7ZJ5PnyBbnPTLvUeZmFHjWXlU="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -1154,12 +1154,12 @@ }; nickel = buildGrammar { language = "nickel"; - version = "0.0.0+rev=d6c7eeb"; + version = "0.0.0+rev=3a79438"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "d6c7eeb751038f934b5b1aa7ff236376d0235c56"; - hash = "sha256-D/RRwXsWyHMxoU7Z8VVJ6jn7zUFKaKusLT/ofON7sOE="; + rev = "3a794388773f2424a97b2186828aa3fac4c66ce6"; + hash = "sha256-NLgbTl1Te/lHTGra4DdxLtqIg6yXf5lfyl37qpp8SNQ="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; @@ -1196,6 +1196,17 @@ }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; + objc = buildGrammar { + language = "objc"; + version = "0.0.0+rev=90773a7"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-objc"; + rev = "90773a72d84d3c9a6eb8e373980e9b6b0bb665a0"; + hash = "sha256-E0vRMAVWLCRmwqW9KqEWpQkRi8PX/XvjoE4U9Fy7wSc="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-objc"; + }; ocaml = buildGrammar { language = "ocaml"; version = "0.0.0+rev=f1106bf"; @@ -1454,12 +1465,12 @@ }; query = buildGrammar { language = "query"; - version = "0.0.0+rev=e975044"; + version = "0.0.0+rev=3a9808b"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "tree-sitter-query"; - rev = "e97504446f14f529d5a8e649667d3d60391e4dfd"; - hash = "sha256-Gv882sbL2fmR++h4/I7dFCp+g6pddRCaLyX7+loEoHU="; + rev = "3a9808b22742d5bd906ef5d1a562f2f1ae57406d"; + hash = "sha256-5N7FT0HTK3xzzhAlk3wBOB9xlEpKSNIfakgFnsxEi18="; }; meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query"; }; @@ -1663,12 +1674,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=9de72fb"; + version = "0.0.0+rev=0f774f4"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "9de72fb40cd6d13a64c3aeeabc079c6b8dadb339"; - hash = "sha256-WcKrYjOnWRf2ei4bAGH7zJJ/DEaaQ8lmAmO5LEkg17g="; + rev = "0f774f4ce1fbc7aa6df6202301e0b08b8c844ae4"; + hash = "sha256-2NkcmwBlDxsvgxRYlZzDcNMw2GZmOIWOCziSPBMrRw4="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -1752,13 +1763,13 @@ }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=4fca25f"; + version = "0.0.0+rev=c5ab392"; src = fetchFromGitea { domain = "codeberg.org"; owner = "xasc"; repo = "tree-sitter-t32"; - rev = "4fca25fa99b6fd9ccf9cab9b6bf702a9df142ad5"; - hash = "sha256-x657aMnqCw/TlS1VyC8er5GQ1QqGdGHGgfSIStUbVfQ="; + rev = "c5ab392fece192875d2206da487449b856afcdef"; + hash = "sha256-OalZs7pP00j3qyQv7mwVx1/jnoM91ZbqwEC17iTxZ/4="; }; meta.homepage = "https://codeberg.org/xasc/tree-sitter-t32"; }; @@ -1909,6 +1920,17 @@ }; meta.homepage = "https://github.com/Philipp-M/tree-sitter-ungrammar"; }; + usd = buildGrammar { + language = "usd"; + version = "0.0.0+rev=04816b1"; + src = fetchFromGitHub { + owner = "ColinKennedy"; + repo = "tree-sitter-usd"; + rev = "04816b1fbfe548e1446a9efe8b069f3f6e095504"; + hash = "sha256-n9sK02luVOv88P8SDCKIaBlEYtYYT0fQ+fjlYuP9AJY="; + }; + meta.homepage = "https://github.com/ColinKennedy/tree-sitter-usd"; + }; uxntal = buildGrammar { language = "uxntal"; version = "0.0.0+rev=14e4760"; From 37fc8dfe31c12bb2759f9f1dc7390b81a9b275c9 Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Fri, 19 May 2023 15:44:05 +0200 Subject: [PATCH 07/51] lkl: Fix kallsyms build error on i686 --- pkgs/applications/virtualization/lkl/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index f091aad6bf54..9f7814538392 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -34,6 +34,9 @@ stdenv.mkDerivation rec { # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484 sed '1i#include ' -i tools/lkl/lib/hijack/xlate.c + '' + lib.optionalString stdenv.isi686 '' + echo CONFIG_KALLSYMS=n >> arch/lkl/configs/defconfig + echo CONFIG_KALLSYMS_BASE_RELATIVE=n >> arch/lkl/configs/defconfig '' + lib.optionalString firewallSupport '' cat ${./lkl-defconfig-enable-nftables} >> arch/lkl/configs/defconfig ''; From f29911cd75de05c46072464519d118329c9364fb Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 20 May 2023 00:17:11 +0200 Subject: [PATCH 08/51] elk7: 7.17.9 -> 7.17.10 Fixes CVE-2023-31413, CVE-2023-26486 and CVE-2023-26487. https://discuss.elastic.co/t/elastic-stack-8-7-0-7-17-10-security-updates/332327 The non official analysis-lemmagen plugin has not yet been released for ES 7.17.10. It is marked as broken in the meantime. --- pkgs/development/tools/misc/kibana/7.x.nix | 8 ++-- pkgs/misc/logging/beats/7.x.nix | 4 +- pkgs/servers/search/elasticsearch/7.x.nix | 8 ++-- pkgs/servers/search/elasticsearch/plugins.nix | 37 ++++++++++--------- pkgs/tools/misc/logstash/7.x.nix | 12 +++--- pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 36 insertions(+), 35 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index e2586f32af3d..eaf5247a4165 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -17,10 +17,10 @@ let plat = elemAt info 1; shas = { - x86_64-linux = "f0f9f65b6ba3cc401a519f764314854f6f1f22a9c3b55dfc5a4921455d64fc0d5b8352d267217076da82157553f235ab3d2506497132f23789b126205177e86b"; - x86_64-darwin = "2ba707a0e7a5c34be98ee5e299b8f1d9ace99a626112efd48ca08bfc9640374ec37fc1761c9ef91599e7a5bf5055d2731759b0337952d7767b02d9c46640be71"; - aarch64-linux = "6899c46a06cceb3bfa5db22cdad90db3063b3859c6059a379ac29ce5755073e45b6914491c7c0ec92c48344c1658ea68f7453992d1a39b70782f699315d175de"; - aarch64-darwin = "194b7288f394ff39af3e114099a8f0f847091fd50231ee50c12105189e2b1dfdff8971795c2c22275ff113734e543cfaf51940682d77576c89d2d5bce9b26b92"; + x86_64-linux = "d3d5e8906e64ae3c469e4df80e1c692ce1912e36f68ddf36b99b7019faf34aebaa329061904a6d2b6a32486c6e19d1c5f2ea30c25479a7960ed93bc1c0cb1691"; + x86_64-darwin = "72a4499efbbbdf425f92beafc1b1d416e66e6ded60e76d9c9af9c3c13ce11862ba54dffbfbd5cbdef6afaad50f0d57532d3524f83acd88840aecc6891f748732"; + aarch64-linux = "ce1b584e1cf98f8fb0e602352564a71efef4f53936dde7a056caed62675a6216624f0db2bc24d8239b8d01f06306bf173dda7a08a1787ba061db01ca0d88359a"; + aarch64-darwin = "72a4499efbbbdf425f92beafc1b1d416e66e6ded60e76d9c9af9c3c13ce11862ba54dffbfbd5cbdef6afaad50f0d57532d3524f83acd88840aecc6891f748732"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 945b3b3ba585..77ac0bd3b59d 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -8,10 +8,10 @@ let beat = package: extraArgs: buildGoModule (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - hash = "sha256-BGi2fGUz0J7BuLo3JA4c2yUlWXdLpjn+AcMHkDGd3js="; + hash = "sha256-Quq32/3NeGhrsy17GrIeBiB3LGQuMFTFl3lAyyU6GZM="; }; - vendorHash = "sha256-FtFHfxCIZ4G1aFfGUgRfTz+zL4OE4SLPuDzXqL6CDyo="; + vendorHash = "sha256-UJjwCRxY1rrymroBqC/SfCVM9vmnQOtLlS3OONih3kM="; subPackages = [ package ]; diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index cd8ddeded826..6eea9d751d51 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -18,10 +18,10 @@ let plat = elemAt info 1; shas = { - x86_64-linux = "f49d8fce010db83e6a89462535c71ba11a1153589038a7db430fc7db44178a55d5538dea80e6d4c690f4f0e838168965297c6a3ae31fbc5020af4d966067a90c"; - x86_64-darwin = "b7d87bfa2e1793354bfb51ea11bbeeb29cfba62633288c3ed4ab9eecc05d05953db9446e7ca46ffe63f5aa646a0534fb8f4aa897a59fa2ae7e200b824576d915"; - aarch64-linux = "aa9624c1777a8530f5eca4f75385de1a95ba8db3d56810cc1e134434438181580c32f5f46ab79094742d077e9b741cfb2549cda549147123dae14109e27a1443"; - aarch64-darwin = "191e04a1e440a5ad679d04f6d852a6ab26cb14870b8af38a2ab6a14251a7b6d1ed7646e33b87f4971bb04a68d767abaecaa8dba07e3ae29211f0a358bb499d61"; + x86_64-linux = "7a2013e43c7fc39e86a31a733cc74c587ef2bba0c013f95ce874f98b488a4f8f0e6fb254a1eedd5c0b0e210aed9a0195f7358fa9653c890e234413ff93190807"; + x86_64-darwin = "e6f49e7c0f59e260b3e3d43e57375c9352976c4f51118005e3a9127f41b59f95e51ea158cd318e99410e6d98464ea1f84432c905d12a84b8f68b2ce35905f944"; + aarch64-linux = "f2790f49b79c381246bbf87431919452af93aa4fd8aa6bc9c1f9031e7ed5d9c649f5bab867c28a7d1602e2285d3f4a5f78f809ac05744b02ad67d68610bb677d"; + aarch64-darwin = "75b66b60650bb82dc517f4a594fa40816d3becb92bf3b349f3e8324cc6b297c8bcacebc08e7661891fd4ede03a099fea56c1509291804dd03345717c36564172"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 74aa4282a62e..8c2ff568df31 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -37,8 +37,8 @@ in version = esVersion; src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; - sha256 = - if version == "7.17.9" then "sha256-70KU7aGUHEZsjykXqHUYspGyX0CCrlS1er9WdUbxxSE=" + hash = + if version == "7.17.10" then "sha256-D08CVW/qHpZZaKnploM4aCJ4bunvPjVmieDYr1d6jQA=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -53,8 +53,8 @@ in version = esVersion; src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; - sha256 = - if version == "7.17.9" then "sha256-oRTs1eK7jpoKaMvc+6rx9qiA8wg+gYUADM0HuJU0nOY=" + hash = + if version == "7.17.10" then "sha256-cpgr2zPCpsLrmshWJWoGNcGl0X+bO/K4A9bMqLv8+H8=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -69,7 +69,7 @@ in version = esVersion; src = fetchurl { url = "https://github.com/vhyza/elasticsearch-${pluginName}/releases/download/v${version}/elasticsearch-${pluginName}-${version}-plugin.zip"; - sha256 = + hash = if version == "7.17.9" then "sha256-iY25apDkS6s0RoR9dVL2o/hFuUo6XhMzLjl8wDSFejk=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -77,6 +77,7 @@ in homepage = "https://github.com/vhyza/elasticsearch-analysis-lemmagen"; description = "LemmaGen Analysis plugin provides jLemmaGen lemmatizer as Elasticsearch token filter"; license = licenses.asl20; + broken = true; # Not released yet for ES 7.17.10 }; }; @@ -85,8 +86,8 @@ in version = esVersion; src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; - sha256 = - if version == "7.17.9" then "sha256-xlEabvNiddEwRfKrHIq1QPFJFMd2gByurIZF9LOxVSs=" + hash = + if version == "7.17.10" then "sha256-UmykO+hZDvlFhEbf7zL2bdw4j6NhByRBu9eH3F6/EtM=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -101,8 +102,8 @@ in version = esVersion; src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; - sha256 = - if version == "7.17.9" then "sha256-J1q87fhL4A5tkxPADgHflPbO2RRMGPUk58l7DEpgd94=" + hash = + if version == "7.17.10" then "sha256-Y/AbLfHSdocX0NQbnKm63gTWgwzssb4kpSwRqLozD9w=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -117,8 +118,8 @@ in version = esVersion; src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; - sha256 = - if version == "7.17.9" then "sha256-BhJtBdsT5Xapehfn0xaTWpSrvT1W+Hhv/yqliA6dBG8=" + hash = + if version == "7.17.10" then "sha256-QIYD7cGpJQg+csv/tekN6GFtdnuhYU6VyAXk7nY/uWs=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -133,8 +134,8 @@ in version = esVersion; src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; - sha256 = - if version == "7.17.9" then "sha256-bjVMVwZfj9WyjkwTXwTJdmaqZ1sWuvOZKXh9PFTOwb8=" + hash = + if version == "7.17.10" then "sha256-L8lS+EPYuhNNTnP3ImeZsBQ5a5DAncs3qBFDWGWISRI=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -149,8 +150,8 @@ in version = esVersion; src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; - sha256 = - if version == "7.17.9" then "sha256-ZyImIHYOz5bOEA+ARtPB2CznTOSjFKsavzWXXEzfkO8=" + hash = + if version == "7.17.10" then "sha256-eXstbxlyS8WzW8u5YiMFXGpILCcEWrIb/IxXVzAGFLU=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -166,13 +167,13 @@ in pluginName = "search-guard"; version = # https://docs.search-guard.com/latest/search-guard-versions - if esVersion == "7.17.9" then "${esVersion}-53.6.0" + if esVersion == "7.17.10" then "${esVersion}-53.7.0" else throw "unsupported version ${esVersion} for plugin ${pluginName}"; src = - if esVersion == "7.17.9" then + if esVersion == "7.17.10" then fetchurl { url = "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip"; - sha256 = "sha256-HwxNvWvjqaI3ytSjNnsGcyt3omIZp69bgwxoufL2Nj8="; + hash = "sha256-FIF4O8z0U2giXVA2cNEdCDbpuJDJhaxHBOmv2fACucw="; } else throw "unsupported version ${version} for plugin ${pluginName}"; meta = with lib; { diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index c462a02f22b3..7bbc5bd6a0df 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -16,14 +16,14 @@ let shas = if enableUnfree then { - x86_64-linux = "a43d592e70f023a594f31a3fba365a9cca6611599bd61f998cb1fc38ddd177d459bce23eaf54f811fe0a87a47cdd4bf4b4d4c8008dab1ac03173371f63b91b6c"; - x86_64-darwin = "7f7d89f438400da178b30f345b6ebc80f55f87f38b8925ca8c9dea86f0e2f23f70ccab03fdef5b83c085f1441e77592aab05006d163bc2af1920e1cc0ebdfc17"; - aarch64-linux = "3c74d622c362e3aa72442a477ef34b0eb9131f5b550166d0f7f422bd3678acf07d75c702691d6606e5501f4b40854a352398d1c2813f1fb0a152663d75d5658b"; + x86_64-linux = "5391bfef09c403a365518a3a8e8f075bb7974b137095b3c7fd2a0173cfa6dbd4a7451170a3657afef3e6a468e90a38d6e7a5b669799878f9389fa44ff8fee026"; + x86_64-darwin = "8e3516b82329a47505358fb7eab486ca39423adc44a1f061c35f6ba225ac2f37330f2afc3e37eb652b6536e5ca35d77ac2485dec743fa8d99dd4fcc60bddbc21"; + aarch64-linux = "06f91a5aabff0f86a4150de6c1fd02fb6d0a44b04ac660597cb4c8356cf1d22552aaa77899db42a49a5e35b3cad73be5d7bad8cacfb4b17e622949329cdf791a"; } else { - x86_64-linux = "7c3f9867853582e5d06b9f895b4740abf56a9b6ce34dfbfb624cf9a4b956f489145cd13f3194a7fb16efc52410f55e797c269dc2957a35bdebf9e1aaa3547eaa"; - x86_64-darwin = "d81c20317a7c163e42f5aad9e148505a64bba8565ff913650a840918b80e6aadde071596e569b0c8f965810b821779ca3d00f9a7cb24a5c86fff571ca9227c38"; - aarch64-linux = "93d9700fc3dd99bc918be19fe41ef60b9071eadcc6fd57833dbf1fff2e0f2419c62f3493a0454f215b0dfd30cec90f1aca5eeff15c4eb3a583519dc9a69e896a"; + x86_64-linux = "ba22c4c414f47515387bb28cc47612bea58aff97c407f2571863e83174a2bef273627f65dd531ed833e40668c79144a501d49c3ec691c1b1c4d8fb0cb124b052"; + x86_64-darwin = "81a97ca06c086fac33f32e90124f649d5ddce09d649021020f434b75b5bff63065f9dc8aa267b72cedd581089bc24db12122f705ef8b69acf8f59f11771cbf77"; + aarch64-linux = "64adb41a7a1b14b21d463b333f3f4470a4db9140e288d379bf79510c83091d5ca27e997961d757cee2329b85d16da6da8a1038a00aeabb1e74ab8f95b841ad0a"; }; this = stdenv.mkDerivation rec { version = elk7Version; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e47611ae21ec..e54fd5bb5609 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7249,7 +7249,7 @@ with pkgs; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. # When updating make sure to update all plugins or they will break! - elk7Version = "7.17.9"; + elk7Version = "7.17.10"; elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { util-linux = util-linuxMinimal; From 35650d8be3f3ac08557bdffce742e9939f70fbc0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 18 May 2023 12:49:51 +0200 Subject: [PATCH 09/51] doc/languages-frameworks/python: update formatting and interpreters Updates all interpreter references with 3.10/3.11, which are the current version, that we recurse into for their package set. Update all code examples with an explicit `format` and expand lists with multiple items as we do in the python package set. Also set `pythonImportsCheck` where tests are disabled. --- doc/languages-frameworks/python.section.md | 351 +++++++++++++++------ 1 file changed, 250 insertions(+), 101 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 88d57618d05d..5c281d6d8600 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -10,7 +10,7 @@ Several versions of the Python interpreter are available on Nix, as well as a high amount of packages. The attribute `python3` refers to the default interpreter, which is currently CPython 3.10. The attribute `python` refers to CPython 2.7 for backwards-compatibility. It is also possible to refer to -specific versions, e.g. `python39` refers to CPython 3.9, and `pypy` refers to +specific versions, e.g. `python311` refers to CPython 3.11, and `pypy` refers to the default PyPy interpreter. Python is used a lot, and in different ways. This affects also how it is @@ -26,10 +26,10 @@ however, are in separate sets, with one set per interpreter version. The interpreters have several common attributes. One of these attributes is `pkgs`, which is a package set of Python libraries for this specific interpreter. E.g., the `toolz` package corresponding to the default interpreter -is `python.pkgs.toolz`, and the CPython 3.9 version is `python39.pkgs.toolz`. +is `python.pkgs.toolz`, and the CPython 3.11 version is `python311.pkgs.toolz`. The main package set contains aliases to these package sets, e.g. -`pythonPackages` refers to `python.pkgs` and `python39Packages` to -`python39.pkgs`. +`pythonPackages` refers to `python.pkgs` and `python311Packages` to +`python311.pkgs`. #### Installing Python and packages {#installing-python-and-packages} @@ -54,7 +54,7 @@ with `python.buildEnv` or `python.withPackages` where the interpreter and other executables are wrapped to be able to find each other and all of the modules. In the following examples we will start by creating a simple, ad-hoc environment -with a nix-shell that has `numpy` and `toolz` in Python 3.9; then we will create +with a nix-shell that has `numpy` and `toolz` in Python 3.11; then we will create a re-usable environment in a single-file Python script; then we will create a full Python environment for development with this same environment. @@ -70,10 +70,10 @@ temporary shell session with a Python and a *precise* list of packages (plus their runtime dependencies), with no other Python packages in the Python interpreter's scope. -To create a Python 3.9 session with `numpy` and `toolz` available, run: +To create a Python 3.11 session with `numpy` and `toolz` available, run: ```sh -$ nix-shell -p 'python39.withPackages(ps: with ps; [ numpy toolz ])' +$ nix-shell -p 'python311.withPackages(ps: with ps; [ numpy toolz ])' ``` By default `nix-shell` will start a `bash` session with this interpreter in our @@ -81,8 +81,7 @@ By default `nix-shell` will start a `bash` session with this interpreter in our ```Python console [nix-shell:~/src/nixpkgs]$ python3 -Python 3.9.12 (main, Mar 23 2022, 21:36:19) -[GCC 11.3.0] on linux +Python 3.11.3 (main, Apr 4 2023, 22:36:41) [GCC 12.2.0] on linux Type "help", "copyright", "credits" or "license" for more information. >>> import numpy; import toolz ``` @@ -102,16 +101,12 @@ will still get 1 wrapped Python interpreter. We can start the interpreter directly like so: ```sh -$ nix-shell -p "python39.withPackages (ps: with ps; [ numpy toolz requests ])" --run python3 +$ nix-shell -p "python311.withPackages (ps: with ps; [ numpy toolz requests ])" --run python3 this derivation will be built: - /nix/store/mpn7k6bkjl41fm51342rafaqfsl10qs4-python3-3.9.12-env.drv -this path will be fetched (0.09 MiB download, 0.41 MiB unpacked): - /nix/store/5gaiacnzi096b6prc6aa1pwrhncmhc8b-python3.9-toolz-0.11.2 -copying path '/nix/store/5gaiacnzi096b6prc6aa1pwrhncmhc8b-python3.9-toolz-0.11.2' from 'https://cache.nixos.org'... -building '/nix/store/mpn7k6bkjl41fm51342rafaqfsl10qs4-python3-3.9.12-env.drv'... -created 279 symlinks in user environment -Python 3.9.12 (main, Mar 23 2022, 21:36:19) -[GCC 11.3.0] on linux + /nix/store/r19yf5qgfiakqlhkgjahbg3zg79549n4-python3-3.11.2-env.drv +building '/nix/store/r19yf5qgfiakqlhkgjahbg3zg79549n4-python3-3.11.2-env.drv'... +created 273 symlinks in user environment +Python 3.11.2 (main, Feb 7 2023, 13:52:42) [GCC 12.2.0] on linux Type "help", "copyright", "credits" or "license" for more information. >>> import requests >>> @@ -150,7 +145,7 @@ Executing this script requires a `python3` that has `numpy`. Using what we learn in the previous section, we could startup a shell and just run it like so: ```ShellSession -$ nix-shell -p 'python39.withPackages(ps: with ps; [ numpy ])' --run 'python3 foo.py' +$ nix-shell -p 'python311.withPackages (ps: with ps; [ numpy ])' --run 'python3 foo.py' The dot product of [1 2] and [3 4] is: 11 ``` @@ -190,17 +185,17 @@ can make it fully reproducible by pinning the `nixpkgs` import: ```python #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.numpy ])" -#!nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/d373d80b1207d52621961b16aa4a3438e4f98167.tar.gz +#!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.numpy ])" +#!nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/e51209796c4262bfb8908e3d6d72302fe4e96f5f.tar.gz import numpy as np a = np.array([1,2]) b = np.array([3,4]) print(f"The dot product of {a} and {b} is: {np.dot(a, b)}") ``` -This will execute with the exact same versions of Python 3.8, numpy, and system +This will execute with the exact same versions of Python 3.10, numpy, and system dependencies a year from now as it does today, because it will always use -exactly git commit `d373d80b1207d52621961b16aa4a3438e4f98167` of Nixpkgs for all +exactly git commit `e51209796c4262bfb8908e3d6d72302fe4e96f5f` of Nixpkgs for all of the package versions. This is also a great way to ensure the script executes identically on different @@ -213,12 +208,15 @@ create a single script with Python dependencies, but in the course of normal development we're usually working in an entire package repository. As explained in the Nix manual, `nix-shell` can also load an expression from a -`.nix` file. Say we want to have Python 3.9, `numpy` and `toolz`, like before, +`.nix` file. Say we want to have Python 3.11, `numpy` and `toolz`, like before, in an environment. We can add a `shell.nix` file describing our dependencies: ```nix with import {}; -(python39.withPackages (ps: [ps.numpy ps.toolz])).env +(python311.withPackages (ps: with ps; [ + numpy + toolz +])).env ``` And then at the command line, just typing `nix-shell` produces the same @@ -232,7 +230,7 @@ What's happening here? imports the `` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. These attributes form the main package set. -2. Then we create a Python 3.9 environment with the `withPackages` function, as before. +2. Then we create a Python 3.11 environment with the `withPackages` function, as before. 3. The `withPackages` function expects us to provide a function as an argument that takes the set of all Python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` @@ -243,7 +241,7 @@ To combine this with `mkShell` you can: ```nix with import {}; let - pythonEnv = python39.withPackages (ps: [ + pythonEnv = python311.withPackages (ps: [ ps.numpy ps.toolz ]); @@ -327,7 +325,7 @@ on NixOS. { # ... environment.systemPackages = with pkgs; [ - (python38.withPackages(ps: with ps; [ numpy toolz ])) + (python310.withPackages(ps: with ps; [ numpy toolz ])) ]; } ``` @@ -348,20 +346,32 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th `toolz` package. ```nix -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +}: buildPythonPackage rec { pname = "toolz"; version = "0.10.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; }; + # has no tests doCheck = false; + pythonImportsCheck = [ + "toolz.itertoolz" + "toolz.functoolz" + "toolz.dicttoolz" + ]; + meta = with lib; { + changelog = "https://github.com/pytoolz/toolz/releases/tag/${version}"; homepage = "https://github.com/pytoolz/toolz"; description = "List processing tools and functional utilities"; license = licenses.bsd3; @@ -376,13 +386,14 @@ arguments is the name of the package, which consists of a basename (generally following the name on PyPi) and a version. Another argument, `src` specifies the source, which in this case is fetched from PyPI using the helper function `fetchPypi`. The argument `doCheck` is used to set whether tests should be run -when building the package. Furthermore, we specify some (optional) meta +when building the package. Since there are no tests, we rely on `pythonImportsCheck` +to test whether the package can be imported. Furthermore, we specify some meta information. The output of the function is a derivation. An expression for `toolz` can be found in the Nixpkgs repository. As explained in the introduction of this Python section, a derivation of `toolz` is available -for each interpreter version, e.g. `python39.pkgs.toolz` refers to the `toolz` -derivation corresponding to the CPython 3.9 interpreter. +for each interpreter version, e.g. `python311.pkgs.toolz` refers to the `toolz` +derivation corresponding to the CPython 3.11 interpreter. The above example works when you're directly working on `pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though, @@ -395,29 +406,35 @@ and adds it along with a `numpy` package to a Python environment. with import {}; ( let - my_toolz = python39.pkgs.buildPythonPackage rec { + my_toolz = python311.pkgs.buildPythonPackage rec { pname = "toolz"; version = "0.10.0"; + format = "setuptools"; - src = python39.pkgs.fetchPypi { + src = python311.pkgs.fetchPypi { inherit pname version; hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; }; + # has no tests doCheck = false; meta = { homepage = "https://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; + # [...] }; }; - in python38.withPackages (ps: [ps.numpy my_toolz]) + in python311.withPackages (ps: with ps; [ + numpy + my_toolz + ]) ).env ``` Executing `nix-shell` will result in an environment in which you can use -Python 3.9 and the `toolz` package. As you can see we had to explicitly mention +Python 3.11 and the `toolz` package. As you can see we had to explicitly mention for which Python version we want to build a package. So, what did we do here? Well, we took the Nix expression that we used earlier @@ -442,21 +459,39 @@ The following example shows which arguments are given to `buildPythonPackage` in order to build [`datashape`](https://github.com/blaze/datashape). ```nix -{ lib, buildPythonPackage, fetchPypi, numpy, multipledispatch, python-dateutil, pytest }: +{ lib +, buildPythonPackage +, fetchPypi + +# dependencies +, numpy, multipledispatch, python-dateutil + +# tests +, pytest +}: buildPythonPackage rec { pname = "datashape"; version = "0.4.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-FLLvdm1MllKrgTGC6Gb0k0deZeVYvtCCLji/B7uhong="; }; - nativeCheckInputs = [ pytest ]; - propagatedBuildInputs = [ numpy multipledispatch python-dateutil ]; + propagatedBuildInputs = [ + multipledispatch + numpy + python-dateutil + ]; + + nativeCheckInputs = [ + pytest + ]; meta = with lib; { + changelog = "https://github.com/blaze/datashape/releases/tag/${version}"; homepage = "https://github.com/ContinuumIO/datashape"; description = "A data description language"; license = licenses.bsd2; @@ -466,9 +501,9 @@ buildPythonPackage rec { ``` We can see several runtime dependencies, `numpy`, `multipledispatch`, and -`python-dateutil`. Furthermore, we have one `nativeCheckInputs`, i.e. `pytest`. `pytest` is a -test runner and is only used during the `checkPhase` and is therefore not added -to `propagatedBuildInputs`. +`python-dateutil`. Furthermore, we have `nativeCheckInputs` with `pytest`. +`pytest` is a test runner and is only used during the `checkPhase` and is +therefore not added to `propagatedBuildInputs`. In the previous case we had only dependencies on other Python packages to consider. Occasionally you have also system libraries to consider. E.g., `lxml` provides @@ -476,20 +511,29 @@ Python bindings to `libxml2` and `libxslt`. These libraries are only required when building the bindings and are therefore added as `buildInputs`. ```nix -{ lib, pkgs, buildPythonPackage, fetchPypi }: +{ lib +, pkgs +, buildPythonPackage +, fetchPypi +}: buildPythonPackage rec { pname = "lxml"; version = "3.4.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-s9NiusRxFydHzaNRMjjxFcvWxfi45jGb9ql6eJJyQJk="; }; - buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; + buildInputs = [ + pkgs.libxml2 + pkgs.libxslt + ]; meta = with lib; { + changelog = "https://github.com/lxml/lxml/releases/tag/lxml-${version}"; description = "Pythonic binding for the libxml2 and libxslt libraries"; homepage = "https://lxml.de"; license = licenses.bsd3; @@ -509,30 +553,47 @@ The bindings don't expect to find each of them in a different folder, and therefore we have to set `LDFLAGS` and `CFLAGS`. ```nix -{ lib, pkgs, buildPythonPackage, fetchPypi, numpy, scipy }: +{ lib +, pkgs +, buildPythonPackage +, fetchPypi + +# dependencies +, numpy +, scipy +}: buildPythonPackage rec { pname = "pyFFTW"; version = "0.9.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-9ru2r6kwhUCaskiFoaPNuJCfCVoUL01J40byvRt4kHQ="; }; - buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble]; + buildInputs = [ + pkgs.fftw + pkgs.fftwFloat + pkgs.fftwLongDouble + ]; - propagatedBuildInputs = [ numpy scipy ]; - - # Tests cannot import pyfftw. pyfftw works fine though. - doCheck = false; + propagatedBuildInputs = [ + numpy + scipy + ]; preConfigure = '' export LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib" export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include" ''; + # Tests cannot import pyfftw. pyfftw works fine though. + doCheck = false; + meta = with lib; { + changelog = "https://github.com/pyFFTW/pyFFTW/releases/tag/v${version}"; description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; homepage = "http://hgomersall.github.com/pyFFTW"; license = with licenses; [ bsd2 bsd3 ]; @@ -590,7 +651,7 @@ To filter tests using pytest, one can do the following: checkPhase = '' runHook preCheck - pytest tests/ --ignore=tests/integration -k 'not download and not update' + pytest tests/ --ignore=tests/integration -k 'not download and not update' --ignore=tests/test_failing.py runHook postCheck ''; @@ -618,10 +679,15 @@ when a package may need many items disabled to run the test suite. Using the example above, the analogous `pytestCheckHook` usage would be: ``` - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; # requires additional data - pytestFlagsArray = [ "tests/" "--ignore=tests/integration" ]; + pytestFlagsArray = [ + "tests/" + "--ignore=tests/integration" + ]; disabledTests = [ # touches network @@ -663,7 +729,10 @@ To help ensure the package still works, `pythonImportsCheck` can attempt to impo the listed modules. ``` - pythonImportsCheck = [ "requests" "urllib" ]; + pythonImportsCheck = [ + "requests" + "urllib" + ]; ``` roughly translates to: @@ -704,9 +773,16 @@ pkg3>=1.0,<=2.0 we can do: ``` - nativeBuildInputs = [ pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "pkg1" "pkg3" ]; - pythonRemoveDeps = [ "pkg2" ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ + "pkg1" + "pkg3" + ]; + pythonRemoveDeps = [ + "pkg2" + ]; ``` which would result in the following `requirements.txt` file: @@ -749,9 +825,13 @@ with the exception of `other` (see `format` in `unittestCheckHook` is a hook which will substitute the setuptools `test` command for a `checkPhase` which runs `python -m unittest discover`: ``` - nativeCheckInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ + unittestCheckHook + ]; - unittestFlagsArray = [ "-s" "tests" "-v" ]; + unittestFlagsArray = [ + "-s" "tests" "-v" + ]; ``` #### Using sphinxHook {#using-sphinxhook} @@ -816,7 +896,7 @@ If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src` is a local source, and if the local source has a `setup.py`, then development mode is activated. -In the following example, we create a simple environment that has a Python 3.9 +In the following example, we create a simple environment that has a Python 3.11 version of our package in it, as well as its dependencies and other packages we like to have in the environment, all specified with `propagatedBuildInputs`. Indeed, we can just add any package we like to have in our environment to @@ -824,12 +904,16 @@ Indeed, we can just add any package we like to have in our environment to ```nix with import {}; -with python39Packages; +with python311Packages; buildPythonPackage rec { name = "mypackage"; src = ./path/to/package/source; - propagatedBuildInputs = [ pytest numpy pkgs.libsndfile ]; + propagatedBuildInputs = [ + pytest + numpy + pkgs.libsndfile + ]; } ``` @@ -857,11 +941,14 @@ Let's split the package definition from the environment definition. We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` ```nix -{ lib, buildPythonPackage }: +{ lib +, buildPythonPackage +}: buildPythonPackage rec { pname = "toolz"; version = "0.10.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -869,6 +956,7 @@ buildPythonPackage rec { }; meta = with lib; { + changelog = "https://github.com/pytoolz/toolz/releases/tag/${version}"; homepage = "https://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; license = licenses.bsd3; @@ -885,9 +973,13 @@ with import {}; ( let toolz = callPackage /path/to/toolz/release.nix { - buildPythonPackage = python38Packages.buildPythonPackage; + buildPythonPackage = python310 +Packages.buildPythonPackage; }; - in python38.withPackages (ps: [ ps.numpy toolz ]) + in python310.withPackages (ps: [ + ps.numpy + toolz + ]) ).env ``` @@ -895,17 +987,17 @@ Important to remember is that the Python version for which the package is made depends on the `python` derivation that is passed to `buildPythonPackage`. Nix tries to automatically pass arguments when possible, which is why generally you don't explicitly define which `python` derivation should be used. In the above -example we use `buildPythonPackage` that is part of the set `python38Packages`, -and in this case the `python38` interpreter is automatically used. +example we use `buildPythonPackage` that is part of the set `python3Packages`, +and in this case the `python3` interpreter is automatically used. ## Reference {#reference} ### Interpreters {#interpreters} -Versions 2.7, 3.7, 3.8, 3.9 and 3.10 of the CPython interpreter are available -as respectively `python27`, `python37`, `python38`, `python39` and `python310`. +Versions 2.7, 3.8, 3.9, 3.10 and 3.11 of the CPython interpreter are available +as respectively `python27`, python38`, `python39`, `python310` and `python311`. The aliases `python2` and `python3` correspond to respectively `python27` and -`python39`. The attribute `python` maps to `python2`. The PyPy interpreters +`python310`. The attribute `python` maps to `python2`. The PyPy interpreters compatible with Python 2.7 and 3 are available as `pypy27` and `pypy3`, with aliases `pypy2` mapping to `pypy27` and `pypy` mapping to `pypy2`. The Nix expressions for the interpreters can be found in @@ -928,7 +1020,7 @@ Each interpreter has the following attributes: - `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation. - `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation. - `sitePackages`. Alias for `lib/${libPrefix}/site-packages`. -- `executable`. Name of the interpreter executable, e.g. `python3.8`. +- `executable`. Name of the interpreter executable, e.g. `python3.10`. - `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`. ### Optimizations {#optimizations} @@ -968,7 +1060,7 @@ attribute set is created for each available Python interpreter. The available sets are * `pkgs.python27Packages` -* `pkgs.python37Packages` +* `pkgs.python3Packages` * `pkgs.python38Packages` * `pkgs.python39Packages` * `pkgs.python310Packages` @@ -978,7 +1070,7 @@ sets are and the aliases * `pkgs.python2Packages` pointing to `pkgs.python27Packages` -* `pkgs.python3Packages` pointing to `pkgs.python39Packages` +* `pkgs.python3Packages` pointing to `pkgs.python310Packages` * `pkgs.pythonPackages` pointing to `pkgs.python2Packages` #### `buildPythonPackage` function {#buildpythonpackage-function} @@ -990,11 +1082,28 @@ using setup hooks. The following is an example: ```nix -{ lib, buildPythonPackage, fetchPypi, hypothesis, setuptools-scm, attrs, py, setuptools, six, pluggy }: +{ lib +, buildPythonPackage +, fetchPypi + +# build-system +, setuptools-scm + +# dependencies +, attrs +, pluggy +, py +, setuptools +, six + +# tests +, hypothesis + }: buildPythonPackage rec { pname = "pytest"; version = "3.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -1006,13 +1115,28 @@ buildPythonPackage rec { rm testing/test_argcomplete.py ''; - nativeCheckInputs = [ hypothesis ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ attrs py setuptools six pluggy ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + attrs + py + setuptools + six + pluggy + ]; + + nativeCheckInputs = [ + hypothesis + ]; meta = with lib; { - maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}"; description = "Framework for writing tests"; + homepage = "https://github.com/pytest-dev/pytest"; + license = licenses.mit; + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; }; } ``` @@ -1114,7 +1238,7 @@ with import {}; }; in pkgs.python3.override {inherit packageOverrides; self = python;}; -in python.withPackages(ps: [ps.blaze])).env +in python.withPackages(ps: [ ps.blaze ])).env ``` #### Optional extra dependencies {#python-optional-dependencies} @@ -1160,18 +1284,24 @@ called with `callPackage` and passed `python` or `pythonPackages` (possibly specifying an interpreter version), like this: ```nix -{ lib, python3 }: +{ lib +, python3 +}: python3.pkgs.buildPythonApplication rec { pname = "luigi"; version = "2.7.9"; + format = "setuptools"; src = python3.pkgs.fetchPypi { inherit pname version; hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw="; }; - propagatedBuildInputs = with python3.pkgs; [ tornado python-daemon ]; + propagatedBuildInputs = with python3.pkgs; [ + tornado + python-daemon + ]; meta = with lib; { ... @@ -1253,7 +1383,10 @@ running `nix-shell` with the following `shell.nix` with import {}; (python3.buildEnv.override { - extraLibs = with python3Packages; [ numpy requests ]; + extraLibs = with python3Packages; [ + numpy + requests + ]; }).env ``` @@ -1279,7 +1412,7 @@ example for the Pyramid Web Framework environment can be written like this: ```nix with import {}; -python.withPackages (ps: [ps.pyramid]) +python.withPackages (ps: [ ps.pyramid ]) ``` `withPackages` passes the correct package set for the specific interpreter @@ -1289,7 +1422,7 @@ version as an argument to the function. In the above example, `ps` equals ```nix with import {}; -python3.withPackages (ps: [ps.pyramid]) +python3.withPackages (ps: [ ps.pyramid ]) ``` Now, `ps` is set to `python3Packages`, matching the version of the interpreter. @@ -1301,7 +1434,10 @@ thus be also written like this: ```nix with import {}; -(python38.withPackages (ps: [ps.numpy ps.requests])).env +(python3.withPackages (ps: with ps; [ + numpy + requests +])).env ``` In contrast to `python.buildEnv`, `python.withPackages` does not support the @@ -1393,7 +1529,7 @@ has security implications and is relevant for those using Python in a When the environment variable `DETERMINISTIC_BUILD` is set, all bytecode will have timestamp 1. The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` -and [PYTHONHASHSEED=0](https://docs.python.org/3.8/using/cmdline.html#envvar-PYTHONHASHSEED). +and [PYTHONHASHSEED=0](https://docs.python.org/3.11/using/cmdline.html#envvar-PYTHONHASHSEED). Both are also exported in `nix-shell`. ### Automatic tests {#automatic-tests} @@ -1408,22 +1544,27 @@ example of such a situation is when `py.test` is used. #### Common issues {#common-issues} * Non-working tests can often be deselected. By default `buildPythonPackage` - runs `python setup.py test`. Most Python modules follows the standard test - protocol where the pytest runner can be used instead. `py.test` supports a - `-k` parameter to ignore test methods or classes: + runs `python setup.py test`. which is deprecated. Most Python modules however + do follow the standard test protocol where the pytest runner can be used + instead. `pytest` supports the `-k` and `--ignore` parameters to ignore test + methods or classes as well as whole files. For `pytestCheckHook` these are + conveniently exposed as `disabledTests` and `disabledTestPaths` respectively. ```nix buildPythonPackage { # ... - # assumes the tests are located in tests - nativeCheckInputs = [ pytest ]; - checkPhase = '' - runHook preCheck + nativeCheckInputs = [ + pytestCheckHook + ]; - py.test -k 'not function_name and not other_function' tests + disabledTests = [ + "function_name" + "other_function" + ]; - runHook postCheck - ''; + disabledTestPaths = [ + "this/file.py" + ]; } ``` @@ -1451,9 +1592,13 @@ with import {}; packageOverrides = self: super: { pandas = super.pandas.overridePythonAttrs(old: {name="foo";}); }; - in pkgs.python38.override {inherit packageOverrides;}; + in pkgs.python310.override { + inherit packageOverrides; + }; -in python.withPackages(ps: [ps.pandas])).env +in python.withPackages (ps: [ + ps.pandas +])).env ``` Using `nix-build` on this expression will build an environment that contains the @@ -1473,7 +1618,11 @@ with import {}; packageOverrides = self: super: { scipy = super.scipy_0_17; }; - in (pkgs.python38.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze]) + in (pkgs.python310.override { + inherit packageOverrides; + }).withPackages (ps: [ + ps.blaze + ]) ).env ``` @@ -1487,11 +1636,11 @@ If you want the whole of Nixpkgs to use your modifications, then you can use let pkgs = import {}; newpkgs = import pkgs.path { overlays = [ (self: super: { - python38 = let + python310 = let packageOverrides = python-self: python-super: { numpy = python-super.numpy_1_18; }; - in super.python38.override {inherit packageOverrides;}; + in super.python310.override {inherit packageOverrides;}; } ) ]; }; in newpkgs.inkscape ``` From 6412c3d60a0e67cedda4c545634660c687efb06b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 May 2023 03:03:13 +0000 Subject: [PATCH 10/51] crowdsec: 1.4.6 -> 1.5.1 --- pkgs/tools/security/crowdsec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/crowdsec/default.nix b/pkgs/tools/security/crowdsec/default.nix index 120a26aa3834..08e418395a55 100644 --- a/pkgs/tools/security/crowdsec/default.nix +++ b/pkgs/tools/security/crowdsec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "crowdsec"; - version = "1.4.6"; + version = "1.5.1"; src = fetchFromGitHub { owner = "crowdsecurity"; repo = pname; rev = "v${version}"; - hash = "sha256-+WvpsZjb1pb8WqK0HJYncJUo6wPkKzKvBi/nLKuhSD4="; + hash = "sha256-Z2msr8I5VqY4c5DBFlh9oMg68SSexiN9pgZuJdYnXVQ="; }; - vendorHash = "sha256-FPsoufB9UDgBDIE3yUq4doBse3qgjP19ussYnMAxntk="; + vendorHash = "sha256-T0gJIJDZzzOuYGNL+b6TriQsKQnAQ6JczkiAvJo1tfc="; nativeBuildInputs = [ installShellFiles ]; From e49bafaee018f801d570534d869f374f30b9984e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 May 2023 04:20:00 +0000 Subject: [PATCH 11/51] rubyPackages: update --- pkgs/top-level/ruby-packages.nix | 88 ++++++++++++++++---------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 98364e6a0c20..f5aaec79deda 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -168,10 +168,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l3xb57zzzfxryir2ssrl6lai4pvszal54fhss50niyi3pzbjdfx"; + sha256 = "0c3jjwp5zax3jsk3ckxy0af8bqcaa7j707ahv2pxp2fi2sb3n3vw"; type = "gem"; }; - version = "4.1.3"; + version = "4.1.5"; }; atomos = { groups = ["default"]; @@ -260,10 +260,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hgrfxzhh9h3jrvaarxa663vzyd5y0s03310zkarbl8bcxd2iwm5"; + sha256 = "06mywzjpi1bh04qwb2wzrngmbaia1mxib5kzwg62cz3j6wclg5xd"; type = "gem"; }; - version = "4.1.3"; + version = "4.1.5"; }; camping = { dependencies = ["mab" "rack"]; @@ -705,10 +705,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dndngqvkm2ih3wqn5ilf9980c1cc57lqn5lywx3myalzpilq05z"; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; crass = { groups = ["default"]; @@ -807,10 +807,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qbj8lvl8lzrbpfj9612iiwxf53drb8jg1l4bd1mcqyds8lw9z9z"; + sha256 = "021a7f9lmvz5d3g4zdzm99xal9w3z6wzv2wyrp3jr929nnlf7hdd"; type = "gem"; }; - version = "7.5.0"; + version = "7.6.0"; }; dnsruby = { dependencies = ["simpleidn"]; @@ -1089,10 +1089,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02yn2jl0bz6kadx5851545rpqnfqd6gzbk2js9fj318jx9kl7r2m"; + sha256 = "1zhids3iqxq8lcslvg49pkg3lyhw4y8ha0q3p0p2grx0dnl2kfi4"; type = "gem"; }; - version = "4.1.3"; + version = "4.1.5"; }; gemoji = { groups = ["default"]; @@ -1120,10 +1120,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12hyzvy3853qrlcczmaq5p31lv16klgnkz598amia3kphgbdg5rb"; + sha256 = "0q86kaw1hcyqbwbp5fbx2rlbv7wdklprf76xvxgsb8qa6dxgyv6f"; type = "gem"; }; - version = "4.1.3"; + version = "4.1.5"; }; git = { dependencies = ["addressable" "rchardet"]; @@ -1174,10 +1174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vapcxmbyfpgid5blm0m6j3g5cajhpr2317yhvfbpa2mgfwjyj4p"; + sha256 = "0plr7159pfy9f5aaxygaz4shzb6y13g83r430583r9ixa6slnll3"; type = "gem"; }; - version = "4.1.3"; + version = "4.1.5"; }; globalid = { dependencies = ["activesupport"]; @@ -1196,10 +1196,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q2mjah6w9lxc6b4ys3rwclqf1fy55x4jjxp7rn2bz6whq768b80"; + sha256 = "186fj7c6wz90y7h569qm25hvyarsslj1mkq0fz9mv7iyj64d9czk"; type = "gem"; }; - version = "4.1.3"; + version = "4.1.5"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1966,10 +1966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xz5mrp103i95r4wfxny1f5x7h7vgnxv2p9cdkmmdjzrsk23rijs"; + sha256 = "0aarly8kl587d100n81cphks5vp2rnkm8dnf69p0dr7k78dasas3"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.1"; }; link-header-parser = { groups = ["default"]; @@ -2019,10 +2019,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mi4ia13fisc97fzd8xcd9wkjdki7zfbmdn1xkdzplicir68gyp8"; + sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; type = "gem"; }; - version = "2.20.0"; + version = "2.21.3"; }; mab = { groups = ["default"]; @@ -2153,10 +2153,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; + sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.2"; }; minima = { dependencies = ["jekyll" "jekyll-feed" "jekyll-seo-tag"]; @@ -2194,10 +2194,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "172ky0r1jfcm3xyg067pia7k1lhc15vw9svv93max120gcdbrvji"; + sha256 = "06n7556vxr3awh92xy1k5bli98bvq4pjm08mnl68ay4fzln7lcsg"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.1"; }; multi_json = { groups = ["default"]; @@ -2361,10 +2361,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fnw0z8zl8b5k35g9m5hhc1g4s6ajzjinhyxnqjrx7l7p07fw71v"; + sha256 = "10zmnzk0b6v48s9nyrgnidcinn06m52ph3mzzcjh5q7xrzii3mb8"; type = "gem"; }; - version = "1.14.3"; + version = "1.15.1"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -2447,10 +2447,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i96sa4av0zg85dmwbvjgmhgspbv98a057w5bg20qq1zcr5v31kv"; + sha256 = "06g5ajjvm961yhqj4mm0j05sfz8fq0ybqcd5i37cyabm7jxxj4d4"; type = "gem"; }; - version = "4.1.3"; + version = "4.1.5"; }; parallel = { groups = ["default"]; @@ -2478,10 +2478,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mzy0s4cdqm5nvgyj55idc2pv51k3zlgw6sa7825dcyrk2ihcx0c"; + sha256 = "146x3jhipg55q9ig7l0x8sryanz1zfhai2vszmih7wmf8zi043gl"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; pastel = { dependencies = ["tty-color"]; @@ -3006,10 +3006,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l46lw5gfj3mcm982wpmx7br4rs466gyislv0hfwcsk8dxhv1zkw"; + sha256 = "0013mnzj6ql3v8nif7fm8n2832jnwa46azync6azsg9d4iblrfmy"; type = "gem"; }; - version = "1.50.2"; + version = "1.51.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -3017,10 +3017,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n2gsafg6p7nr1z8i1hkvp2qqkkbg842ba183dnl0h08xd9ms6q5"; + sha256 = "0gs8zjigzdqj0kcmmrhvd4zavwr6kz6h9qvrh9m7bhy56f4aqljs"; type = "gem"; }; - version = "1.28.0"; + version = "1.28.1"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -3216,20 +3216,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wizqirxln8f2d4aihqizfbyzlssnan058zkqh24siynk38567lg"; + sha256 = "0n6hiim82lfydzv71lgzmkyacsbm3q5nw7ixavprci5wrl9zwls7"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.1"; }; sequel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qajss2mc8rw9pxgfjl4mxacnss5xnr603ydms0knmm6cb61vlb4"; + sha256 = "0p6z0mdglwynlcz4mnlk1mz8vxsr41id1pf0dfrbgnwpv8zvlika"; type = "gem"; }; - version = "5.67.0"; + version = "5.68.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -3353,10 +3353,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i47n6nkyigkyag00yqf9f3nj11bm1lb0ds5nkvkdvm7lxbna5jq"; + sha256 = "0h95kr5529qv786mfk8r2jjdsdi6v7v3k3dpz69mrcc9i0vpdd37"; type = "gem"; }; - version = "1.6.2"; + version = "1.6.3"; }; string_inflection = { groups = ["default"]; @@ -3416,10 +3416,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07k5wr2ypsmsbyc9d1plhdki4xr7vvggld8r1i49iljkrpx5nbqc"; + sha256 = "1jj8lny5hp8gm920k73r6xpb40j5mpiw1dcr8g5id4hxjggkw8by"; type = "gem"; }; - version = "0.10.0"; + version = "0.10.1"; }; terminal-table = { groups = ["default"]; @@ -3436,10 +3436,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; thrift = { groups = ["default"]; From f889c11af9f8f860df70b103fde27b87146db81a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 May 2023 04:20:00 +0000 Subject: [PATCH 12/51] python310Packages.pglast: 5.1 -> 5.2 Changelog: https://github.com/lelit/pglast/raw/v5.2/CHANGES.rst --- pkgs/development/python-modules/pglast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 81445ebdeded..b96c884d458b 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "5.1"; + version = "5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fHWJWgy/Ven5m2Cf81rG/ZKmFFWiLJsIPVxFe+rr+ms="; + hash = "sha256-zj7/WGECL5Ou4F2FdFaA3M9F92ETZbhEXbZJ628gg0o="; }; propagatedBuildInputs = [ From fb8cf11a95b470d96afd9c1cea954723867802bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 May 2023 04:38:07 +0000 Subject: [PATCH 13/51] nebula: 1.6.1 -> 1.7.0 --- pkgs/tools/networking/nebula/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 6f4483cd7283..c2123e9ca8f0 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nebula"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IsLSlQsrfw3obkz4jHL23BRQY2fviGbPEvs5j0zkdX0="; + sha256 = "sha256-B0i980mfbfC5p4mIsW3L4v1ilajxtZbp1DQowFw3ghw="; }; - vendorSha256 = "sha256-GvMiOEC3Y/pGG++Z+XCgLVADKymUR9shDxjx3xIz8u0="; + vendorHash = "sha256-VZzSdl8R1y7rCF2vz7e+5nAkb3wlJymNWCXwZZUvg4A="; subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; From 439e05b1263e0794cc73416719454787b9493b0a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 May 2023 10:22:01 +0200 Subject: [PATCH 14/51] python310Packages.dvc-data: 0.51.0 -> 0.52.0 Diff: https://github.com/iterative/dvc-data/compare/refs/tags/0.51.0...0.52.0 Changelog: https://github.com/iterative/dvc-data/releases/tag/0.52.0 --- pkgs/development/python-modules/dvc-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index db1d68842cea..937970d67cd2 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "0.51.0"; + version = "0.52.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kLxwBFDoGEZ8w3PHEh8IVDEbmlbwazhZBAoBAUQFDEo="; + hash = "sha256-Z5luqKuUForepBTZ7s2uDI09bK0NVhYMADFOj13nt0I="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 7ee413cf3543783351d62a4215ee28aa3e0bf007 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 May 2023 10:32:30 +0200 Subject: [PATCH 15/51] nebula: add changelog to meta --- pkgs/tools/networking/nebula/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index c2123e9ca8f0..9cf6d562afe9 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib +, buildGoModule +, fetchFromGitHub +, nixosTests +}: buildGoModule rec { pname = "nebula"; @@ -7,8 +11,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "slackhq"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-B0i980mfbfC5p4mIsW3L4v1ilajxtZbp1DQowFw3ghw="; + rev = "refs/tags/v${version}"; + hash = "sha256-B0i980mfbfC5p4mIsW3L4v1ilajxtZbp1DQowFw3ghw="; }; vendorHash = "sha256-VZzSdl8R1y7rCF2vz7e+5nAkb3wlJymNWCXwZZUvg4A="; @@ -22,7 +26,7 @@ buildGoModule rec { }; meta = with lib; { - description = "A scalable overlay networking tool with a focus on performance, simplicity and security"; + description = "Overlay networking tool with a focus on performance, simplicity and security"; longDescription = '' Nebula is a scalable overlay networking tool with a focus on performance, simplicity and security. It lets you seamlessly connect computers @@ -39,8 +43,8 @@ buildGoModule rec { parts. ''; homepage = "https://github.com/slackhq/nebula"; + changelog = "https://github.com/slackhq/nebula/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne numinit ]; }; - } From 0749e39f647888d290eef3efcfedf16ddd1df1b3 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 20 May 2023 13:09:20 +0200 Subject: [PATCH 16/51] tomcat9: 9.0.68 -> 9.0.75 Fixes CVE-2022-45143 and CVE-2023-28708. https://tomcat.apache.org/tomcat-9.0-doc/changelog.html --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index eec573b72f66..1925fc47e8ee 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -32,8 +32,8 @@ let in { tomcat9 = common { versionMajor = "9"; - versionMinor = "0.68"; - sha256 = "sha256-rxsv8zEIIbTel4CqIuncS5pellGwgHamKRa0KgzsOF0="; + versionMinor = "0.75"; + sha256 = "sha256-VWfKg789z+ns1g3hDsCZFYQ+PsdqUEBeBHCihkGZelk="; }; tomcat10 = common { From f6976e11e0999aa4c7df1ceca467ed2d5c4a5858 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 May 2023 13:39:35 +0000 Subject: [PATCH 17/51] exiv2: 0.27.6 -> 0.27.7 --- pkgs/development/libraries/exiv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 436d3cdf3ad1..d1cd4894f1f5 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.27.6"; + version = "0.27.7"; outputs = [ "out" "lib" "dev" "doc" "man" "static" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; - sha256 = "sha256-Ddy605EQhsATzmdhN3Zq+2ksYMrHEfucA+IqezYmjo4="; + sha256 = "sha256-xytVGrLDS22n2/yydFTT6CsDESmhO9mFbPGX4yk+b6g="; }; nativeBuildInputs = [ From fd53d1fc0ca181d0ae8a811994669eacb8018e2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 May 2023 16:13:06 +0000 Subject: [PATCH 18/51] argocd: 2.7.1 -> 2.7.2 --- pkgs/applications/networking/cluster/argocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 45e15ab47bec..a23346b2c4bb 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-1P3FIgC9j0SbwzWo0aPUwVTKNlSY3FG7Iz6KD9pbv84="; + sha256 = "sha256-pmF0EJfidYRZRelvXLfwANbv+DnfgLXVeKfjRSbnKjY="; }; proxyVendor = true; # darwin/linux hash mismatch From 6dbe5d6930d02ad546ff41dac7fe5c8b50192796 Mon Sep 17 00:00:00 2001 From: "Ian M. Jones" Date: Sat, 20 May 2023 17:58:52 +0100 Subject: [PATCH 19/51] wails: 2.4.1 -> 2.5.1 Update Wails app builder to v2.5.1 Changelogs: - https://github.com/wailsapp/wails/releases/tag/v2.5.0 - https://github.com/wailsapp/wails/releases/tag/v2.5.1 --- pkgs/development/tools/wails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index f7489e69fcda..195eae2e3546 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "wails"; - version = "2.4.1"; + version = "2.5.1"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ei+bp4fwlxZ9ZiXW/FqpqICXpFxpmOKkZZYW0LxHh1s="; + sha256 = "sha256-4JTkViqJ1rmVg6JGJ+uZrIo/mh6o1VE39gYoILdFWBE="; } + "/v2"; vendorSha256 = "sha256-RiectpUhm24xjgfPZEMDVFSEzPtIjn7L/qC2KE2s5aw="; From 828244022d5c8ea56facb3bb482faac68b200ca8 Mon Sep 17 00:00:00 2001 From: Infinitive Witch Date: Sat, 20 May 2023 14:09:44 -0300 Subject: [PATCH 20/51] komikku: 1.20.0 -> 1.21.1 Signed-off-by: Infinitive Witch --- pkgs/applications/graphics/komikku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index 1c3b040944be..8676883628c4 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.20.0"; + version = "1.21.1"; format = "other"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-gBnpps++dwcXCLSVjtK3nMJMcJ43vKeNzgCWEt1kn7g="; + hash = "sha256-1VqV0tTI8XVwGJhaGWEdSxtWDhQFmrsncvhC4ftJ7Jg="; }; nativeBuildInputs = [ From 91d415a123b119aef9a4d3f5d818bcdbefb27dcc Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 16 May 2023 01:01:10 +0100 Subject: [PATCH 21/51] nanomq: 0.16.3 -> 0.18.2 --- pkgs/servers/mqtt/nanomq/default.nix | 74 +++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/mqtt/nanomq/default.nix b/pkgs/servers/mqtt/nanomq/default.nix index c02626b52801..06fec792f32a 100644 --- a/pkgs/servers/mqtt/nanomq/default.nix +++ b/pkgs/servers/mqtt/nanomq/default.nix @@ -1,16 +1,51 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config -, cyclonedds, libmysqlclient, mariadb, mbedtls, sqlite, zeromq +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, pkg-config +, cyclonedds +, libmysqlclient +, mariadb +, mbedtls +, sqlite +, zeromq +, flex +, bison + +# for tests +, python3 +, mosquitto +, netcat-gnu }: -stdenv.mkDerivation (finalAttrs: { +let + + # exposing as full package in its own right would be a + # bit absurd - repo doesn't even have a license. + idl-serial = stdenv.mkDerivation { + pname = "idl-serial"; + version = "unstable-2023-03-29"; + + src = fetchFromGitHub { + owner = "nanomq"; + repo = "idl-serial"; + rev = "908c364dab4c0dcdd77b8de698d29c8a0b6d3830"; + hash = "sha256-3DS9DuzHN7BevfgiekUmKKH9ej9wKTrt6Fuh427NC4I="; + }; + + nativeBuildInputs = [ cmake ninja flex bison ]; + }; + +in stdenv.mkDerivation (finalAttrs: { pname = "nanomq"; - version = "0.16.3"; + version = "0.18.2"; src = fetchFromGitHub { owner = "emqx"; repo = "nanomq"; rev = finalAttrs.version; - hash = "sha256-9w4afVxuJbYrkagpAe1diftDnjrRjunyhJdJ0BZq3K0="; + hash = "sha256-XGJBBuRSL3InXUMGxOttdbt0zmI1APFlc4IvwC2up8g="; fetchSubmodules = true; }; @@ -19,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "DESTINATION /etc" "DESTINATION $out/etc" ''; - nativeBuildInputs = [ cmake ninja pkg-config ]; + nativeBuildInputs = [ cmake ninja pkg-config idl-serial ]; buildInputs = [ cyclonedds libmysqlclient mariadb mbedtls sqlite zeromq ]; @@ -35,6 +70,33 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; + # disabled by default - not 100% reliable and making nanomq depend on + # mosquitto would annoy people + doInstallCheck = false; + nativeInstallCheckInputs = [ + mosquitto + netcat-gnu + (python3.withPackages (ps: with ps; [ jinja2 requests paho-mqtt ])) + ]; + installCheckPhase = '' + runHook preInstallCheck + + ( + cd .. + + # effectively distable this test because it is slow + echo > .github/scripts/fuzzy_test.txt + + PATH="$PATH:$out/bin" python .github/scripts/test.py + ) + + runHook postInstallCheck + ''; + + passthru.tests = { + withInstallChecks = finalAttrs.finalPackage.overrideAttrs (_: { doInstallCheck = true; }); + }; + meta = with lib; { description = "An ultra-lightweight and blazing-fast MQTT broker for IoT edge"; homepage = "https://nanomq.io/"; From 23cf0d4b69defae9bd6e80b3d4a96a069f14c27b Mon Sep 17 00:00:00 2001 From: apfelkuchen06 Date: Sat, 20 May 2023 12:59:47 +0200 Subject: [PATCH 22/51] texlive.bin.core-big: fix CVE-2023-32700 This fixes a bug that allowed any document compiled with LuaTeX to execute arbitrary shell commands, even with shell escape disabled. See https://tug.org/~mseven/luatex.html for more details. --- pkgs/tools/typesetting/tex/texlive/bin.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index c29c68a7dfb0..d77bc836464d 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -202,6 +202,14 @@ core-big = stdenv.mkDerivation { #TODO: upmendex url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=1009196;filename=reproducible_exception_strings.patch;msg=5"; sha256 = "sha256-RNZoEeTcWnrLaltcYrhNIORh42fFdwMzBfxMRWVurbk="; }) + # fixes a security-issue in luatex that allows arbitrary code execution even with shell-escape disabled, see https://tug.org/~mseven/luatex.html + (fetchpatch { + name = "CVE-2023-32700.patch"; + url = "https://tug.org/~mseven/luatex-files/2022/patch"; + hash = "sha256-o9ENLc1ZIIOMX6MdwpBIgrR/Jdw6tYLmAyzW8i/FUbY="; + excludes = [ "build.sh" ]; + stripLen = 1; + }) ]; hardeningDisable = [ "format" ]; From 458d44a550c177c6e8c5d464765febea4052e2ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 May 2023 17:35:17 +0000 Subject: [PATCH 23/51] python311Packages.gtts: 2.3.1 -> 2.3.2 --- pkgs/development/python-modules/gtts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index be70ec9df094..aaf2886d81b8 100644 --- a/pkgs/development/python-modules/gtts/default.nix +++ b/pkgs/development/python-modules/gtts/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.3.1"; + version = "2.3.2"; format = "pyproject"; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; rev = "refs/tags/v${version}"; - hash = "sha256-dbIcx6U5TIy3CteUGrZqcWqOJoZD2HILaJmKDY+j/II="; + hash = "sha256-Z5dM/PzIA8qtw0RepTKmHpqBwYMRwNLhWuEC0aBGL3U="; }; propagatedBuildInputs = [ From f07f108c7c0ff8969a2d708cc199183f9a198516 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Sat, 20 May 2023 14:40:24 -0400 Subject: [PATCH 24/51] python311Packages.pympler: fix tests --- .../python-modules/pympler/default.nix | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index 3763aeabbcf6..9b801e42c8a9 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -1,7 +1,10 @@ { lib, stdenv +, bottle , buildPythonPackage +, fetchpatch , fetchPypi , pytestCheckHook +, pythonAtLeast }: buildPythonPackage rec { @@ -13,14 +16,36 @@ buildPythonPackage rec { sha256 = "993f1a3599ca3f4fcd7160c7545ad06310c9e12f70174ae7ae8d4e25f6c5d3fa"; }; + patches = [ + # Fixes a TypeError on Python 3.11 + # (see https://github.com/pympler/pympler/issues/148) + (fetchpatch { + name = "${pname}-python-3.11-compat.patch"; + url = "https://github.com/pympler/pympler/pull/149.patch"; + hash = "sha256-6MK0AuhVhQkUzlk29HUh1+mSbfsVTBJ1YBtYNIFhh7U="; + }) + ]; + nativeCheckInputs = [ pytestCheckHook ]; + # There is a version of bottle bundled with Pympler, but it is broken on + # Python 3.11. Fortunately, Pympler will preferentially import an external + # bottle if it is available, so we make it an explicit dependency. + propagatedBuildInputs = [ + bottle + ]; + disabledTests = [ # 'AssertionError: 'function (test.muppy.test_summary.func)' != 'function (muppy.test_summary.func)' # https://github.com/pympler/pympler/issues/134 "test_repr_function" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/pympler/pympler/issues/148 + "test_findgarbage" + "test_get_tree" + "test_prune" ]; doCheck = stdenv.hostPlatform.isLinux; From 2d9c30663078e97411c199275193c384075e7744 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 May 2023 18:49:09 +0000 Subject: [PATCH 25/51] doppler: 3.58.0 -> 3.60.1 --- pkgs/tools/security/doppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 88e03ba04bf0..d58869c5d4c9 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.58.0"; + version = "3.60.1"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-1cAsoaKKxSz2YhwMkfyzAyH8zFHm7YWS01/3CmcD8uY="; + sha256 = "sha256-WzR2oKBQ3GEEmOC0hhb6tcVR4GfapS0LzLCJosQo37k="; }; vendorHash = "sha256-yuGjaUHfXCJnMvxfaSwbVAApflwfsvX2W7iEZdruMDE="; From 384aff71f2d2bdd044e3c7072b4bdfc431eeac62 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Sat, 20 May 2023 14:55:06 -0400 Subject: [PATCH 26/51] python3Packages.scancode-toolkit: fix build Version 31.2.4 requires an alpha release of spdx-tools, but we package a stable release. A patch is necessary to use the stable API. --- .../python-modules/scancode-toolkit/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 9d50a87e3c48..4dc74dcbf6a1 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -16,9 +16,10 @@ , extractcode-libarchive , fasteners , fetchPypi +, fetchpatch , fingerprints , ftfy -, gemfileparser +, gemfileparser2 , html5lib , importlib-metadata , intbitset @@ -89,7 +90,7 @@ buildPythonPackage rec { fasteners fingerprints ftfy - gemfileparser + gemfileparser2 html5lib importlib-metadata intbitset @@ -133,13 +134,23 @@ buildPythonPackage rec { pytestCheckHook ]; + patches = [ + (fetchpatch { + name = "${pname}-allow-stable-spdx-tools.patch"; + url = "https://github.com/nexB/scancode-toolkit/commit/d89ab6584d3df6b7eb1d1394559e9d967d6db6ae.patch"; + includes = [ "src/*" ]; + hash = "sha256-AU3vJlOxmCy3yvkupVaAVxAKxJI3ymXEk+A5DWSkfOM="; + }) + ]; + postPatch = '' substituteInPlace setup.cfg \ --replace "pdfminer.six >= 20200101" "pdfminer.six" \ --replace "pluggy >= 0.12.0, < 1.0" "pluggy" \ --replace "pygmars >= 0.7.0" "pygmars" \ --replace "license_expression >= 21.6.14" "license_expression" \ - --replace "intbitset >= 2.3.0, < 3.0" "intbitset" + --replace "intbitset >= 2.3.0, < 3.0" "intbitset" \ + --replace "spdx_tools == 0.7.0a3" "spdx_tools" ''; # Importing scancode needs a writeable home, and preCheck happens in between From 95c7a595cef4ffb097bf3718a29982d8d66902b7 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Thu, 18 May 2023 17:07:32 +0200 Subject: [PATCH 27/51] helix: 23.03 -> 23.05 Switch to self-build of the tree-sitter grammar files and use the git repo as source directly --- pkgs/applications/editors/helix/Cargo.lock | 2561 ----------------- pkgs/applications/editors/helix/default.nix | 43 +- pkgs/applications/editors/helix/grammars.nix | 107 + .../editors/helix/language-grammars.json | 1 + pkgs/applications/editors/helix/update.py | 47 + 5 files changed, 179 insertions(+), 2580 deletions(-) delete mode 100644 pkgs/applications/editors/helix/Cargo.lock create mode 100644 pkgs/applications/editors/helix/grammars.nix create mode 100644 pkgs/applications/editors/helix/language-grammars.json create mode 100755 pkgs/applications/editors/helix/update.py diff --git a/pkgs/applications/editors/helix/Cargo.lock b/pkgs/applications/editors/helix/Cargo.lock deleted file mode 100644 index b7ed2c9c8182..000000000000 --- a/pkgs/applications/editors/helix/Cargo.lock +++ /dev/null @@ -1,2561 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" - -[[package]] -name = "arc-swap" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" - -[[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 = "bstr" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" -dependencies = [ - "memchr", - "once_cell", - "regex-automata", - "serde", -] - -[[package]] -name = "btoi" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad" -dependencies = [ - "num-traits", -] - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "bytecount" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cassowary" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" - -[[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 = "chardetng" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b8f0b65b7b08ae3c8187e8d77174de20cb6777864c6b832d8ad365999cf1ea" -dependencies = [ - "cfg-if", - "encoding_rs", - "memchr", -] - -[[package]] -name = "chrono" -version = "0.4.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" -dependencies = [ - "iana-time-zone", - "num-integer", - "num-traits", - "winapi", -] - -[[package]] -name = "clipboard-win" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" -dependencies = [ - "error-code", - "str-buf", - "winapi", -] - -[[package]] -name = "clru" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807" - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "content_inspector" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38" -dependencies = [ - "memchr", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossterm" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "futures-core", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" -dependencies = [ - "winapi", -] - -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.11", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.11", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dunce" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "encoding_rs_io" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83" -dependencies = [ - "encoding_rs", -] - -[[package]] -name = "errno" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - -[[package]] -name = "etcetera" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d017fce18e4e9bfa75e1db51f49f4487bd3f8a7df509b24a46474a956ee962fd" -dependencies = [ - "cfg-if", - "dirs-next", - "thiserror", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fern" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" -dependencies = [ - "log", -] - -[[package]] -name = "filetime" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.2.16", - "windows-sys", -] - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures-core" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" - -[[package]] -name = "futures-executor" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-task" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" - -[[package]] -name = "futures-util" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" -dependencies = [ - "futures-core", - "futures-task", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fuzzy-matcher" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" -dependencies = [ - "thread_local", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gix" -version = "0.43.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c256ea71cc1967faaefdaad15f334146b7c806f12460dcafd3afed845c8c78dd" -dependencies = [ - "gix-actor", - "gix-attributes", - "gix-config", - "gix-credentials", - "gix-date", - "gix-diff", - "gix-discover", - "gix-features", - "gix-glob", - "gix-hash", - "gix-hashtable", - "gix-index", - "gix-lock", - "gix-mailmap", - "gix-object", - "gix-odb", - "gix-pack", - "gix-path", - "gix-prompt", - "gix-ref", - "gix-refspec", - "gix-revision", - "gix-sec", - "gix-tempfile", - "gix-traverse", - "gix-url", - "gix-validate", - "gix-worktree", - "log", - "once_cell", - "signal-hook", - "smallvec", - "thiserror", - "unicode-normalization", -] - -[[package]] -name = "gix-actor" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc22b0cdc52237667c301dd7cdc6ead8f8f73c9f824e9942c8ebd6b764f6c0bf" -dependencies = [ - "bstr", - "btoi", - "gix-date", - "itoa", - "nom", - "thiserror", -] - -[[package]] -name = "gix-attributes" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2231a25934a240d0a4b6f4478401c73ee81d8be52de0293eedbc172334abf3e1" -dependencies = [ - "bstr", - "gix-features", - "gix-glob", - "gix-path", - "gix-quote", - "thiserror", - "unicode-bom", -] - -[[package]] -name = "gix-bitmap" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "024bca0c7187517bda5ea24ab148c9ca8208dd0c3e2bea88cdb2008f91791a6d" -dependencies = [ - "thiserror", -] - -[[package]] -name = "gix-chunk" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d39583cab06464b8bf73b3f1707458270f0e7383cb24c3c9c1a16e6f792978" -dependencies = [ - "thiserror", -] - -[[package]] -name = "gix-command" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2c6f75c1e0f924de39e750880a6e21307194bb1ab773efe3c7d2d787277f8ab" -dependencies = [ - "bstr", -] - -[[package]] -name = "gix-config" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fbad5ce54a8fc997acc50febd89ec80fa6e97cb7f8d0654cb229936407489d8" -dependencies = [ - "bstr", - "gix-config-value", - "gix-features", - "gix-glob", - "gix-path", - "gix-ref", - "gix-sec", - "log", - "memchr", - "nom", - "once_cell", - "smallvec", - "thiserror", - "unicode-bom", -] - -[[package]] -name = "gix-config-value" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09154c0c8677e4da0ec35e896f56ee3e338e741b9599fae06075edd83a4081c" -dependencies = [ - "bitflags 1.3.2", - "bstr", - "gix-path", - "libc", - "thiserror", -] - -[[package]] -name = "gix-credentials" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "750b684197374518ea057e0a0594713e07683faa0a3f43c0f93d97f64130ad8d" -dependencies = [ - "bstr", - "gix-command", - "gix-config-value", - "gix-path", - "gix-prompt", - "gix-sec", - "gix-url", - "thiserror", -] - -[[package]] -name = "gix-date" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96271912ce39822501616f177dea7218784e6c63be90d5f36322ff3a722aae2" -dependencies = [ - "bstr", - "itoa", - "thiserror", - "time", -] - -[[package]] -name = "gix-diff" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103a0fa79b0d438f5ecb662502f052e530ace4fe1fe8e1c83c0c6da76d728e67" -dependencies = [ - "gix-hash", - "gix-object", - "imara-diff", - "thiserror", -] - -[[package]] -name = "gix-discover" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eba8ba458cb8f4a6c33409b0fe650b1258655175a7ffd1d24fafd3ed31d880b" -dependencies = [ - "bstr", - "dunce", - "gix-hash", - "gix-path", - "gix-ref", - "gix-sec", - "thiserror", -] - -[[package]] -name = "gix-features" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b76f9a80f6dd7be66442ae86e1f534effad9546676a392acc95e269d0c21c22" -dependencies = [ - "crc32fast", - "flate2", - "gix-hash", - "libc", - "once_cell", - "prodash", - "sha1_smol", - "thiserror", - "walkdir", -] - -[[package]] -name = "gix-glob" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e43efd776bc543f46f0fd0ca3d920c37af71a764a16f2aebd89765e9ff2993" -dependencies = [ - "bitflags 1.3.2", - "bstr", -] - -[[package]] -name = "gix-hash" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0c5a9f4d621d4f4ea046bb331df5c746ca735b8cae5b234cc2be70ee4dbef0" -dependencies = [ - "hex", - "thiserror", -] - -[[package]] -name = "gix-hashtable" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9609c1b8f36f12968e6a6098f7cdb52004f7d42d570f47a2d6d7c16612f19acb" -dependencies = [ - "gix-hash", - "hashbrown 0.13.2", - "parking_lot", -] - -[[package]] -name = "gix-index" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "717ab601ece7921f59fe86849dbe27d44a46ebb883b5885732c4f30df4996177" -dependencies = [ - "bitflags 1.3.2", - "bstr", - "btoi", - "filetime", - "gix-bitmap", - "gix-features", - "gix-hash", - "gix-lock", - "gix-object", - "gix-traverse", - "itoa", - "memmap2", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-lock" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b80172055c5d8017a48ddac5cc7a95421c00211047db0165c97853c4f05194" -dependencies = [ - "fastrand", - "gix-tempfile", - "thiserror", -] - -[[package]] -name = "gix-mailmap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b66aea5e52875cd4915f4957a6f4b75831a36981e2ec3f5fad9e370e444fe1a" -dependencies = [ - "bstr", - "gix-actor", - "thiserror", -] - -[[package]] -name = "gix-object" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df068db9180ee935fbb70504848369e270bdcb576b05c0faa8b9fd3b86fc017" -dependencies = [ - "bstr", - "btoi", - "gix-actor", - "gix-features", - "gix-hash", - "gix-validate", - "hex", - "itoa", - "nom", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-odb" -version = "0.43.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83af2e3e36005bfe010927f0dff41fb5acc3e3d89c6f1174135b3a34086bda2" -dependencies = [ - "arc-swap", - "gix-features", - "gix-hash", - "gix-object", - "gix-pack", - "gix-path", - "gix-quote", - "parking_lot", - "tempfile", - "thiserror", -] - -[[package]] -name = "gix-pack" -version = "0.33.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9401911c7fe032ad7b31c6a6b5be59cb283d1d6c999417a8215056efe6d635f3" -dependencies = [ - "clru", - "gix-chunk", - "gix-diff", - "gix-features", - "gix-hash", - "gix-hashtable", - "gix-object", - "gix-path", - "gix-tempfile", - "gix-traverse", - "memmap2", - "parking_lot", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-path" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32370dce200bb951df013e03dff35b4233fc7a89458642b047629b91734a7e19" -dependencies = [ - "bstr", - "thiserror", -] - -[[package]] -name = "gix-prompt" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3034d4d935aef2c7bf719aaa54b88c520e82413118d886ae880a31d5bdee57" -dependencies = [ - "gix-command", - "gix-config-value", - "nix", - "parking_lot", - "thiserror", -] - -[[package]] -name = "gix-quote" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a282f5a8d9ee0b09ec47390ac727350c48f2f5c76d803cd8da6b3e7ad56e0bcb" -dependencies = [ - "bstr", - "btoi", - "thiserror", -] - -[[package]] -name = "gix-ref" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e909396ed3b176823991ccc391c276ae2a015e54edaafa3566d35123cfac9d" -dependencies = [ - "gix-actor", - "gix-features", - "gix-hash", - "gix-lock", - "gix-object", - "gix-path", - "gix-tempfile", - "gix-validate", - "memmap2", - "nom", - "thiserror", -] - -[[package]] -name = "gix-refspec" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba332462bda2e8efeae4302b39a6ed01ad56ef772fd5b7ef197cf2798294d65" -dependencies = [ - "bstr", - "gix-hash", - "gix-revision", - "gix-validate", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-revision" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12fc4bbc3161a5b2d68079fce93432cef8771ff88ca017abb01187fddfc41a1" -dependencies = [ - "bstr", - "gix-date", - "gix-hash", - "gix-hashtable", - "gix-object", - "thiserror", -] - -[[package]] -name = "gix-sec" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ffa5bf0772f9b01de501c035b6b084cf9b8bb07dec41e3afc6a17336a65f47" -dependencies = [ - "bitflags 1.3.2", - "dirs", - "gix-path", - "libc", - "windows 0.43.0", -] - -[[package]] -name = "gix-tempfile" -version = "5.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ceb30a610e3f5f2d5f9a5114689fde507ba9417705a8cf3429604275b2153c" -dependencies = [ - "libc", - "once_cell", - "parking_lot", - "signal-hook", - "signal-hook-registry", - "tempfile", -] - -[[package]] -name = "gix-traverse" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd9a4a07bb22168dc79c60e1a6a41919d198187ca83d8a5940ad8d7122a45df3" -dependencies = [ - "gix-hash", - "gix-hashtable", - "gix-object", - "thiserror", -] - -[[package]] -name = "gix-url" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a22b4b32ad14d68f7b7fb6458fa58d44b01797d94c1b8f4db2d9c7b3c366b5" -dependencies = [ - "bstr", - "gix-features", - "gix-path", - "home", - "thiserror", - "url", -] - -[[package]] -name = "gix-validate" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd629d3680773e1785e585d76fd4295b740b559cad9141517300d99a0c8c049" -dependencies = [ - "bstr", - "thiserror", -] - -[[package]] -name = "gix-worktree" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ec9a000b4f24af706c3cc680c7cda235656cbe3216336522f5692773b8a301" -dependencies = [ - "bstr", - "gix-attributes", - "gix-features", - "gix-glob", - "gix-hash", - "gix-index", - "gix-object", - "gix-path", - "io-close", - "thiserror", -] - -[[package]] -name = "globset" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] -name = "grep-matcher" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3902ca28f26945fe35cad349d776f163981d777fee382ccd6ef451126f51b319" -dependencies = [ - "memchr", -] - -[[package]] -name = "grep-regex" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "997598b41d53a37a2e3fc5300d5c11d825368c054420a9c65125b8fe1078463f" -dependencies = [ - "aho-corasick", - "bstr", - "grep-matcher", - "log", - "regex", - "regex-syntax", - "thread_local", -] - -[[package]] -name = "grep-searcher" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5601c4b9f480f0c9ebb40b1f6cbf447b8a50c5369223937a6c5214368c58779f" -dependencies = [ - "bstr", - "bytecount", - "encoding_rs", - "encoding_rs_io", - "grep-matcher", - "log", - "memmap2", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.6", -] - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.3", -] - -[[package]] -name = "helix-core" -version = "0.6.0" -dependencies = [ - "ahash 0.8.3", - "arc-swap", - "bitflags 2.0.2", - "chrono", - "dunce", - "encoding_rs", - "etcetera", - "hashbrown 0.13.2", - "helix-loader", - "imara-diff", - "indoc", - "log", - "once_cell", - "quickcheck", - "regex", - "ropey", - "serde", - "serde_json", - "slotmap", - "smallvec", - "smartstring", - "textwrap", - "toml", - "tree-sitter", - "unicode-general-category", - "unicode-segmentation", - "unicode-width", -] - -[[package]] -name = "helix-dap" -version = "0.6.0" -dependencies = [ - "anyhow", - "fern", - "helix-core", - "log", - "serde", - "serde_json", - "thiserror", - "tokio", - "which", -] - -[[package]] -name = "helix-loader" -version = "0.6.0" -dependencies = [ - "anyhow", - "cc", - "etcetera", - "libloading", - "log", - "once_cell", - "serde", - "threadpool", - "toml", - "tree-sitter", -] - -[[package]] -name = "helix-lsp" -version = "0.6.0" -dependencies = [ - "anyhow", - "futures-executor", - "futures-util", - "helix-core", - "helix-loader", - "helix-parsec", - "log", - "lsp-types", - "parking_lot", - "serde", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", - "which", -] - -[[package]] -name = "helix-parsec" -version = "0.6.0" - -[[package]] -name = "helix-term" -version = "0.6.0" -dependencies = [ - "anyhow", - "arc-swap", - "chrono", - "content_inspector", - "crossterm", - "fern", - "futures-util", - "fuzzy-matcher", - "grep-regex", - "grep-searcher", - "helix-core", - "helix-dap", - "helix-loader", - "helix-lsp", - "helix-tui", - "helix-vcs", - "helix-view", - "ignore", - "indoc", - "libc", - "log", - "once_cell", - "pulldown-cmark", - "serde", - "serde_json", - "signal-hook", - "signal-hook-tokio", - "smallvec", - "tempfile", - "tokio", - "tokio-stream", - "toml", - "which", -] - -[[package]] -name = "helix-tui" -version = "0.6.0" -dependencies = [ - "bitflags 2.0.2", - "cassowary", - "crossterm", - "helix-core", - "helix-view", - "log", - "once_cell", - "serde", - "termini", - "unicode-segmentation", -] - -[[package]] -name = "helix-vcs" -version = "0.6.0" -dependencies = [ - "anyhow", - "arc-swap", - "gix", - "helix-core", - "imara-diff", - "log", - "parking_lot", - "tempfile", - "tokio", -] - -[[package]] -name = "helix-view" -version = "0.6.0" -dependencies = [ - "anyhow", - "arc-swap", - "bitflags 2.0.2", - "chardetng", - "clipboard-win", - "crossterm", - "futures-util", - "helix-core", - "helix-dap", - "helix-loader", - "helix-lsp", - "helix-tui", - "helix-vcs", - "libc", - "log", - "once_cell", - "parking_lot", - "serde", - "serde_json", - "slotmap", - "tokio", - "tokio-stream", - "toml", - "url", - "which", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "home" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408" -dependencies = [ - "winapi", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "716f12fbcfac6ffab0a5e9ec51d0a0ff70503742bb2dc7b99396394c9dc323f0" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows 0.47.0", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" -dependencies = [ - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - -[[package]] -name = "imara-diff" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8" -dependencies = [ - "ahash 0.8.3", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indoc" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690" - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-close" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys", -] - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.140" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "lsp-types" -version = "0.94.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b63735a13a1f9cd4f4835223d828ed9c2e35c8c5e61837774399f558b6a1237" -dependencies = [ - "bitflags 1.3.2", - "serde", - "serde_json", - "serde_repr", - "url", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys", -] - -[[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", - "static_assertions", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "windows-sys", -] - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "proc-macro2" -version = "1.0.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "prodash" -version = "23.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9516b775656bc3e8985e19cd4b8c0c0de045095074e453d2c0a513b5f978392d" - -[[package]] -name = "pulldown-cmark" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" -dependencies = [ - "bitflags 1.3.2", - "memchr", - "unicase", -] - -[[package]] -name = "quickcheck" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" -dependencies = [ - "rand", -] - -[[package]] -name = "quote" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "ropey" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ce7a2c43a32e50d666e33c5a80251b31147bb4b49024bcab11fb6f20c671ed" -dependencies = [ - "smallvec", - "str_indices", -] - -[[package]] -name = "rustix" -version = "0.37.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e78cc525325c06b4a7ff02db283472f3c042b7ff0c391f96c6d5ac6f4f91b75" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - -[[package]] -name = "serde" -version = "1.0.159" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.159" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.11", -] - -[[package]] -name = "serde_json" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.11", -] - -[[package]] -name = "serde_spanned" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" -dependencies = [ - "serde", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "signal-hook" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "signal-hook-tokio" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213241f76fb1e37e27de3b6aa1b068a2c333233b59cca6634f634b80a27ecf1e" -dependencies = [ - "futures-core", - "libc", - "signal-hook", - "tokio", -] - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slotmap" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" -dependencies = [ - "version_check", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "static_assertions", - "version_check", -] - -[[package]] -name = "smawk" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - -[[package]] -name = "str_indices" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f026164926842ec52deb1938fae44f83dfdb82d0a5b0270c5bd5935ab74d6dd" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "termini" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c0f7ecb9c2a380d2686a747e4fc574043712326e8d39fbd220ab3bd29768a12" -dependencies = [ - "dirs-next", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" -dependencies = [ - "smawk", - "unicode-linebreak", - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.11", -] - -[[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 = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "time" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" -dependencies = [ - "itoa", - "libc", - "num_threads", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" -dependencies = [ - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" -dependencies = [ - "autocfg", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys", -] - -[[package]] -name = "tokio-macros" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.11", -] - -[[package]] -name = "tokio-stream" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tree-sitter" -version = "0.20.9" -source = "git+https://github.com/tree-sitter/tree-sitter?rev=c51896d32dcc11a38e41f36e3deb1a6a9c4f4b14#c51896d32dcc11a38e41f36e3deb1a6a9c4f4b14" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-bom" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ec69f541d875b783ca40184d655f2927c95f0bffd486faa83cd3ac3529ec32" - -[[package]] -name = "unicode-general-category" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-linebreak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" -dependencies = [ - "hashbrown 0.12.3", - "regex", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "which" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -dependencies = [ - "either", - "libc", - "once_cell", -] - -[[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.43.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2649ff315bee4c98757f15dac226efe3d81927adbb6e882084bb1ee3e0c330a7" -dependencies = [ - "windows-targets 0.47.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", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f8996d3f43b4b2d44327cd71b7b0efd1284ab60e6e9d0e8b630e18555d87d3e" -dependencies = [ - "windows_aarch64_gnullvm 0.47.0", - "windows_aarch64_msvc 0.47.0", - "windows_i686_gnu 0.47.0", - "windows_i686_msvc 0.47.0", - "windows_x86_64_gnu 0.47.0", - "windows_x86_64_gnullvm 0.47.0", - "windows_x86_64_msvc 0.47.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.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831d567d53d4f3cb1db332b68e6e2b6260228eb4d99a777d8b2e8ed794027c90" - -[[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.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a42d54a417c60ce4f0e31661eed628f0fa5aca73448c093ec4d45fab4c51cdf" - -[[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.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1925beafdbb22201a53a483db861a5644123157c1c3cee83323a2ed565d71e3" - -[[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.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8ef8f2f1711b223947d9b69b596cf5a4e452c930fb58b6fc3fdae7d0ec6b31" - -[[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.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acaa0c2cf0d2ef99b61c308a0c3dbae430a51b7345dedec470bd8f53f5a3642" - -[[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.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a0628f71be1d11e17ca4a0e9e15b3a5180f6fbf1c2d55e3ba3f850378052c1" - -[[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.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6e62c256dc6d40b8c8707df17df8d774e60e39db723675241e7c15e910bce7" - -[[package]] -name = "winnow" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" -dependencies = [ - "memchr", -] - -[[package]] -name = "xtask" -version = "0.6.0" -dependencies = [ - "helix-core", - "helix-loader", - "helix-term", - "helix-view", - "toml", -] diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index caeb86d5551d..03ddac3b5ef0 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -1,33 +1,33 @@ -{ fetchzip, lib, rustPlatform, installShellFiles, makeWrapper }: +{ fetchFromGitHub, lib, rustPlatform, installShellFiles, makeWrapper, callPackage }: + +let + version = "23.05"; + + src = fetchFromGitHub { + owner = "helix-editor"; + repo = "helix"; + rev = "${version}"; + hash = "sha256-Ws9uWtZLvTwL5HNonFr4YwyPoTU8QlCvhs6IJ92aLDw="; + }; + + grammars = callPackage ./grammars.nix { }; +in rustPlatform.buildRustPackage { + inherit src version; -rustPlatform.buildRustPackage rec { pname = "helix"; - version = "23.03"; - # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. - src = fetchzip { - url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; - hash = "sha256-FtY2V7za3WGeUaC2t2f63CcDUEg9zAS2cGUWI0YeGwk="; - stripRoot = false; - }; - - # should be removed, when tree-sitter is not used as a git checkout anymore - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "tree-sitter-0.20.9" = "sha256-/PaFaASOT0Z8FpipX5uiRCjnv1kyZtg4B9+TnHA0yTY="; - }; - }; + cargoSha256 = "sha256-/LCtfyDAA2JuioBD/CDMv6OOxM0B9A3PpuVP/YY5oF0="; nativeBuildInputs = [ installShellFiles makeWrapper ]; postInstall = '' - # not needed at runtime - rm -r runtime/grammars/sources + # We self build the grammar files + rm -r runtime/grammars mkdir -p $out/lib cp -r runtime $out/lib + ln -s ${grammars} $out/lib/runtime/grammars installShellCompletion contrib/completion/hx.{bash,fish,zsh} mkdir -p $out/share/{applications,icons/hicolor/256x256/apps} cp contrib/Helix.desktop $out/share/applications @@ -37,6 +37,11 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/hx --set HELIX_RUNTIME $out/lib/runtime ''; + # disable fetching and building of tree-sitter grammars in favor of the custom build process in ./grammars.nix + env.HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1"; + + passthru.updateScript = ./update.py; + meta = with lib; { description = "A post-modern modal text editor"; homepage = "https://helix-editor.com"; diff --git a/pkgs/applications/editors/helix/grammars.nix b/pkgs/applications/editors/helix/grammars.nix new file mode 100644 index 000000000000..be764ac75693 --- /dev/null +++ b/pkgs/applications/editors/helix/grammars.nix @@ -0,0 +1,107 @@ +{ + stdenv, + lib, + runCommand, + includeGrammarIf ? _: true, + fetchFromGitHub, + fetchgit, + ... +}: let + # similiar to https://github.com/helix-editor/helix/blob/23.05/grammars.nix + grammars = builtins.fromJSON (builtins.readFile ./language-grammars.json); + isGitGrammar = grammar: + builtins.hasAttr "source" grammar + && builtins.hasAttr "git" grammar.source + && builtins.hasAttr "rev" grammar.source; + isGitHubGrammar = grammar: lib.hasPrefix "https://github.com" grammar.source.git; + toGitHubFetcher = url: let + match = builtins.match "https://github\.com/([^/]*)/([^/]*)/?" url; + in { + owner = builtins.elemAt match 0; + repo = builtins.elemAt match 1; + }; + gitGrammars = builtins.filter isGitGrammar grammars; + buildGrammar = grammar: let + gh = toGitHubFetcher grammar.source.git; + sourceGit = fetchgit { + url = grammar.source.git; + inherit (grammar.source) rev sha256; + }; + sourceGitHub = fetchFromGitHub { + owner = gh.owner; + repo = gh.repo; + inherit (grammar.source) rev sha256; + }; + source = + if isGitHubGrammar grammar + then sourceGitHub + else sourceGit; + in + stdenv.mkDerivation rec { + # similar to tree-sitter grammar generation + pname = "helix-tree-sitter-grammar-${grammar.name}"; + version = grammar.source.rev; + + src = + if builtins.hasAttr "subpath" grammar.source + then "${source}/${grammar.source.subpath}" + else source; + + dontUnpack = true; + dontConfigure = true; + + FLAGS = [ + "-I${src}/src" + "-g" + "-O3" + "-fPIC" + "-fno-exceptions" + "-Wl,-z,relro,-z,now" + ]; + + NAME = grammar.name; + + buildPhase = '' + runHook preBuild + + if [[ -e "$src/src/scanner.cc" ]]; then + $CXX -c "$src/src/scanner.cc" -o scanner.o $FLAGS + elif [[ -e "$src/src/scanner.c" ]]; then + $CC -c "$src/src/scanner.c" -o scanner.o $FLAGS + fi + + $CC -c "$src/src/parser.c" -o parser.o $FLAGS + $CXX -shared -o $NAME.so *.o + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir $out + mv $NAME.so $out/ + runHook postInstall + ''; + + # Strip failed on darwin: strip: error: symbols referenced by indirect symbol table entries that can't be stripped + fixupPhase = lib.optionalString stdenv.isLinux '' + runHook preFixup + $STRIP $out/$NAME.so + runHook postFixup + ''; + }; + grammarsToBuild = builtins.filter includeGrammarIf gitGrammars; + builtGrammars = + builtins.map (grammar: { + inherit (grammar) name; + artifact = buildGrammar grammar; + }) + grammarsToBuild; + grammarLinks = + builtins.map (grammar: "ln -s ${grammar.artifact}/${grammar.name}.so $out/${grammar.name}.so") + builtGrammars; +in + runCommand "helix-tree-sitter-grammars" {} '' + mkdir -p $out + ${builtins.concatStringsSep "\n" grammarLinks} + '' diff --git a/pkgs/applications/editors/helix/language-grammars.json b/pkgs/applications/editors/helix/language-grammars.json new file mode 100644 index 000000000000..31d4eb620a7c --- /dev/null +++ b/pkgs/applications/editors/helix/language-grammars.json @@ -0,0 +1 @@ +[{"name": "rust", "source": {"git": "https://github.com/tree-sitter/tree-sitter-rust", "rev": "0431a2c60828731f27491ee9fdefe25e250ce9c9", "sha256": "149jhy01mqvavwa8jlxb8bnn7sxpfq2x1w35si6zn60b7kqjlx8f"}}, {"name": "sway", "source": {"git": "https://github.com/FuelLabs/tree-sitter-sway", "rev": "e491a005ee1d310f4c138bf215afd44cfebf959c", "sha256": "0d9qszx7iy8dk68ic24gwdm9xm2636ig7nb3n76l5a1jnsk0i03d"}}, {"name": "toml", "source": {"git": "https://github.com/ikatyang/tree-sitter-toml", "rev": "7cff70bbcbbc62001b465603ca1ea88edd668704", "sha256": "001pjz32v1b3sawlab68fdqz4xwk0v65wj5cdbcav2w1d9n9rhcd"}}, {"name": "awk", "source": {"git": "https://github.com/Beaglefoot/tree-sitter-awk", "rev": "a799bc5da7c2a84bc9a06ba5f3540cf1191e4ee3", "sha256": "0rw9p60vf2119vvjqnr4an85bryr8nq7jh0pkhzwpy7xh0nszy83"}}, {"name": "protobuf", "source": {"git": "https://github.com/yusdacra/tree-sitter-protobuf", "rev": "19c211a01434d9f03efff99f85e19f967591b175", "sha256": "04gxmrc0xf6x96sv347i1p00jcai31ml0s1csj1iz5mjdzgsllhh"}}, {"name": "elixir", "source": {"git": "https://github.com/elixir-lang/tree-sitter-elixir", "rev": "b20eaa75565243c50be5e35e253d8beb58f45d56", "sha256": "1i0c0xki3sv24649p0ws7xs2jagbwg7z7baz1960239bj94nl487"}}, {"name": "fish", "source": {"git": "https://github.com/ram02z/tree-sitter-fish", "rev": "84436cf24c2b3176bfbb220922a0fdbd0141e406", "sha256": "12s3db2mg9qa8l1i4a5h59kd7kl5j83wyl5kzq7j2k56xmvq56x0"}}, {"name": "json", "source": {"git": "https://github.com/tree-sitter/tree-sitter-json", "rev": "73076754005a460947cafe8e03a8cf5fa4fa2938", "sha256": "1npf2hrx33jhjpmzcyi7aszg436m4d80sa6h4mhhkmx51q4kpcf1"}}, {"name": "c", "source": {"git": "https://github.com/tree-sitter/tree-sitter-c", "rev": "7175a6dd5fc1cee660dce6fe23f6043d75af424a", "sha256": "1w03r4l773ki4iq2xxsc2pqxf3pjsbybq3xq4glmnsihgylibn8v"}}, {"name": "cpp", "source": {"git": "https://github.com/tree-sitter/tree-sitter-cpp", "rev": "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1", "sha256": "1fv87f5ba8gxqxaf5ykhgjvkilml920rbxhdcf9d7jkh794mccq6"}}, {"name": "c-sharp", "source": {"git": "https://github.com/tree-sitter/tree-sitter-c-sharp", "rev": "5b60f99545fea00a33bbfae5be956f684c4c69e2", "sha256": "1dzfnj9b5xgx0av4xyvd71i8bj3hxaq97s91np5jzd2vjvbvw7p1"}}, {"name": "go", "source": {"git": "https://github.com/tree-sitter/tree-sitter-go", "rev": "64457ea6b73ef5422ed1687178d4545c3e91334a", "sha256": "16d32m78y8jricba9xav35c9y0k2r29irj5xyqgq24323yln9jnz"}}, {"name": "gomod", "source": {"git": "https://github.com/camdencheek/tree-sitter-go-mod", "rev": "e8f51f8e4363a3d9a427e8f63f4c1bbc5ef5d8d0", "sha256": "09rkqwdwhsm41nrz73rqbajap4bc0spjcld9k9fr8xmlmqa67j2b"}}, {"name": "gotmpl", "source": {"git": "https://github.com/dannylongeuay/tree-sitter-go-template", "rev": "395a33e08e69f4155156f0b90138a6c86764c979", "sha256": "0v1ciqdr9zj3hrzg9rrikr6v72yjs25sk631kd32r024igpxflv2"}}, {"name": "gowork", "source": {"git": "https://github.com/omertuc/tree-sitter-go-work", "rev": "6dd9dd79fb51e9f2abc829d5e97b15015b6a8ae2", "sha256": "1kzrs4rpby3b0h87rbr02k55k3mmkmdy7rvl11q95b3ym0smmyqb"}}, {"name": "javascript", "source": {"git": "https://github.com/tree-sitter/tree-sitter-javascript", "rev": "4a95461c4761c624f2263725aca79eeaefd36cad", "sha256": "0za77agy25pj14hi93rjc1ib79l4q43lc5crgwnsc9d72pr8cwwm"}}, {"name": "typescript", "source": {"git": "https://github.com/tree-sitter/tree-sitter-typescript", "rev": "6aac031ad88dd6317f02ac0bb27d099a553a7d8c", "subpath": "typescript", "sha256": "012fyvk95pr11anypsi1cyxgj3has8zqlj74fwmcxd9f8pk7c595"}}, {"name": "tsx", "source": {"git": "https://github.com/tree-sitter/tree-sitter-typescript", "rev": "6aac031ad88dd6317f02ac0bb27d099a553a7d8c", "subpath": "tsx", "sha256": "012fyvk95pr11anypsi1cyxgj3has8zqlj74fwmcxd9f8pk7c595"}}, {"name": "css", "source": {"git": "https://github.com/tree-sitter/tree-sitter-css", "rev": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51", "sha256": "05875jmkkklx0b5g1h4qc8cbgcj8mr1n8slw7hsn0wssn7yn42z5"}}, {"name": "scss", "source": {"git": "https://github.com/serenadeai/tree-sitter-scss", "rev": "c478c6868648eff49eb04a4df90d703dc45b312a", "sha256": "15r3jiv36hzx2pmjmp63am3pbc01s52z36xfraa1aw4wlx7lqnq4"}}, {"name": "html", "source": {"git": "https://github.com/tree-sitter/tree-sitter-html", "rev": "29f53d8f4f2335e61bf6418ab8958dac3282077a", "sha256": "0wadphmgndj4vq9mg258624pj0klspbpcx8qlc6f8by5xbshvkmz"}}, {"name": "python", "source": {"git": "https://github.com/tree-sitter/tree-sitter-python", "rev": "de221eccf9a221f5b85474a553474a69b4b5784d", "sha256": "1mp2rqv6p2nla0sh1s5hprq32b9nkwbj2q21dcpvdcg6gack1sdf"}}, {"name": "nickel", "source": {"git": "https://github.com/nickel-lang/tree-sitter-nickel", "rev": "9d83db400b6c11260b9106f131f93ddda8131933", "sha256": "0rm63fnxja59zzkm7gz4vbzics8mdf7d6ijazcy9394kdqrcdzi6"}}, {"name": "nix", "source": {"git": "https://github.com/nix-community/tree-sitter-nix", "rev": "1b69cf1fa92366eefbe6863c184e5d2ece5f187d", "sha256": "0ls9djhpbbnjvd6b3166zjy92di0927f70720b57j2d3925538i5"}}, {"name": "ruby", "source": {"git": "https://github.com/tree-sitter/tree-sitter-ruby", "rev": "206c7077164372c596ffa8eaadb9435c28941364", "sha256": "1pqr24bj68lgi1w2cblr8asfby681l3032jrppq4n9x5zm23fi6n"}}, {"name": "bash", "source": {"git": "https://github.com/tree-sitter/tree-sitter-bash", "rev": "275effdfc0edce774acf7d481f9ea195c6c403cd", "sha256": "14ficjp82cdamylgx090z3rkr5b2q04i2w3854yavli9zf57lwpr"}}, {"name": "php", "source": {"git": "https://github.com/tree-sitter/tree-sitter-php", "rev": "f860e598194f4a71747f91789bf536b393ad4a56", "sha256": "02yc5b3qps8ghsmy4b5m5kldyr5pnqz9yw663v13pnz92r84k14g"}}, {"name": "twig", "source": {"git": "https://github.com/gbprod/tree-sitter-twig", "rev": "807b293fec3fead64f54c64fdf6fb05516c032b9", "sha256": "17ifa0k4z8gcs54b0hvaibdhnfpa6r54qr82c8j5p1fzahrsdb3i"}}, {"name": "latex", "source": {"git": "https://github.com/latex-lsp/tree-sitter-latex", "rev": "8c75e93cd08ccb7ce1ccab22c1fbd6360e3bcea6", "sha256": "0lc42x604f04x3kkp88vyqa5dx90wqyisiwl7nn861lyxl6phjnf"}}, {"name": "bibtex", "source": {"git": "https://github.com/latex-lsp/tree-sitter-bibtex", "rev": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34", "sha256": "0m7f3dkqbmy8x1bhl11m8f4p6n76wfvh99rp46zrqv39355nw1y2"}}, {"name": "lean", "source": {"git": "https://github.com/Julian/tree-sitter-lean", "rev": "d98426109258b266e1e92358c5f11716d2e8f638", "sha256": "0sc5h0fan8cmpxxf2jizky0ynmr81qs9q7xgh9zrmdi69r59p0sk"}}, {"name": "julia", "source": {"git": "https://github.com/tree-sitter/tree-sitter-julia", "rev": "8fb38abff74652c4faddbf04d2d5bbbc6b4bae25", "sha256": "06h5nyxw72z3w5a62y59332w2xg90sm3c2j6na7vvf7nark7vb8v"}}, {"name": "java", "source": {"git": "https://github.com/tree-sitter/tree-sitter-java", "rev": "09d650def6cdf7f479f4b78f595e9ef5b58ce31e", "sha256": "0440xh8x8rkbdlc1f1ail9wzl4583l29ic43x9lzl8290bm64q5l"}}, {"name": "ledger", "source": {"git": "https://github.com/cbarrete/tree-sitter-ledger", "rev": "1f864fb2bf6a87fe1b48545cc6adc6d23090adf7", "sha256": "1qxdad40nladdnq6d2s1z7fxlwjz8llpj85da792pv7p7dwh95vd"}}, {"name": "beancount", "source": {"git": "https://github.com/polarmutex/tree-sitter-beancount", "rev": "4cbd1f09cd07c1f1fabf867c2cf354f9da53cc4c", "sha256": "0igv4nal56d4ppj9zpdjc9i49r755dcvz3csfrps0d0p2v47y7sj"}}, {"name": "ocaml", "source": {"git": "https://github.com/tree-sitter/tree-sitter-ocaml", "rev": "23d419ba45789c5a47d31448061557716b02750a", "subpath": "ocaml", "sha256": "1bh3afd3iix0gf6ldjngf2c65nyfdwvbmsq25gcxm04jwbg9c6k8"}}, {"name": "ocaml-interface", "source": {"git": "https://github.com/tree-sitter/tree-sitter-ocaml", "rev": "23d419ba45789c5a47d31448061557716b02750a", "subpath": "interface", "sha256": "1bh3afd3iix0gf6ldjngf2c65nyfdwvbmsq25gcxm04jwbg9c6k8"}}, {"name": "lua", "source": {"git": "https://github.com/MunifTanjim/tree-sitter-lua", "rev": "887dfd4e83c469300c279314ff1619b1d0b85b91", "sha256": "1lv3mp0xm5ac9440gcskcxy0hzsnddvcysix1k5axy1cl4vr8bz6"}}, {"name": "svelte", "source": {"git": "https://github.com/Himujjal/tree-sitter-svelte", "rev": "349a5984513b4a4a9e143a6e746120c6ff6cf6ed", "sha256": "0yyzp836c2q4k5dpywb5m5dxh8h53f3l5gcm5qi5bb8qisvccm6n"}}, {"name": "vue", "source": {"git": "https://github.com/ikatyang/tree-sitter-vue", "rev": "91fe2754796cd8fba5f229505a23fa08f3546c06", "sha256": "0l0kqy9ajm5izqcywd39aavgmc281s8qrhmjkbwl6r8arfj8vsrm"}}, {"name": "yaml", "source": {"git": "https://github.com/ikatyang/tree-sitter-yaml", "rev": "0e36bed171768908f331ff7dff9d956bae016efb", "sha256": "0wyvjh62zdp5bhd2y8k7k7x4wz952l55i1c8d94rhffsbbf9763f"}}, {"name": "haskell", "source": {"git": "https://github.com/tree-sitter/tree-sitter-haskell", "rev": "98fc7f59049aeb713ab9b72a8ff25dcaaef81087", "sha256": "15b2xypg7npa6q1w8nhd5jrcpwyy52z8n6s5b1j1n006aacg6fq4"}}, {"name": "zig", "source": {"git": "https://github.com/maxxnino/tree-sitter-zig", "rev": "8d3224c3bd0890fe08358886ebf54fca2ed448a6", "sha256": "0mw4s92qmxkh9a13h9hg6kv9b704vzx3kr4j6dap0c80dffvfjhk"}}, {"name": "tsq", "source": {"git": "https://github.com/the-mikedavis/tree-sitter-tsq", "rev": "48b5e9f82ae0a4727201626f33a17f69f8e0ff86", "sha256": "015zsvwwm58b5yzk6dl3kzdpg142qpvbb3fv7804jbjqwi1xy8di"}}, {"name": "cmake", "source": {"git": "https://github.com/uyha/tree-sitter-cmake", "rev": "6e51463ef3052dd3b328322c22172eda093727ad", "sha256": "14l7l6cc9pdqinff9hjda7rakzfvwk0qcbv6djl0s9f21875l4nv"}}, {"name": "make", "source": {"git": "https://github.com/alemuller/tree-sitter-make", "rev": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd", "sha256": "07gz4x12xhigar2plr3jgazb2z4f9xp68nscmvy9a7wafak9l2m9"}}, {"name": "glsl", "source": {"git": "https://github.com/theHamsta/tree-sitter-glsl", "rev": "88408ffc5e27abcffced7010fc77396ae3636d7e", "sha256": "1zsj20xxv8mcj991gyp2gi2h31p16znkjxgbw5lpymj3nz7w22ld"}}, {"name": "perl", "source": {"git": "https://github.com/ganezdragon/tree-sitter-perl", "rev": "0ac2c6da562c7a2c26ed7e8691d4a590f7e8b90a", "sha256": "184zaicrl9i4cywhyc2cxpghw7daz9pi0fhwkkgpv7j6kvp1ig2w"}}, {"name": "comment", "source": {"git": "https://github.com/stsewd/tree-sitter-comment", "rev": "5dd3c62f1bbe378b220fe16b317b85247898639e", "sha256": "1wk6lxzndaikbrn72pa54y59qs0xnfaffc8mxmm6c5v5x16l8vb3"}}, {"name": "wgsl", "source": {"git": "https://github.com/szebniok/tree-sitter-wgsl", "rev": "272e89ef2aeac74178edb9db4a83c1ffef80a463", "sha256": "02nrgw6ypblr226r3d2wh6nn8x6bb3f16ix8anbppgrkzhfam3f7"}}, {"name": "llvm", "source": {"git": "https://github.com/benwilliamgraham/tree-sitter-llvm", "rev": "3b213925b9c4f42c1acfe2e10bfbb438d9c6834d", "sha256": "0ymrdcajji11852c158w67mgcsycphwj9mh777q3n4jn8pp37y8j"}}, {"name": "llvm-mir", "source": {"git": "https://github.com/Flakebi/tree-sitter-llvm-mir", "rev": "06fabca19454b2dc00c1b211a7cb7ad0bc2585f1", "sha256": "1a3ymx9baspxcjvgb0i7369zg42ikl5nf61f9b1y18azs940l35r"}}, {"name": "tablegen", "source": {"git": "https://github.com/Flakebi/tree-sitter-tablegen", "rev": "568dd8a937347175fd58db83d4c4cdaeb6069bd2", "sha256": "1w03navfgpgg4db9x0xvr2z0l8m07nma4icv0fwdgin4nk59lp4l"}}, {"name": "markdown", "source": {"git": "https://github.com/MDeiml/tree-sitter-markdown", "rev": "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d", "subpath": "tree-sitter-markdown", "sha256": "0wryvq7153a3jx9qs1plm5crlgd88sm1ymlqc3gs09mr2n456z9z"}}, {"name": "markdown_inline", "source": {"git": "https://github.com/MDeiml/tree-sitter-markdown", "rev": "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d", "subpath": "tree-sitter-markdown-inline", "sha256": "0wryvq7153a3jx9qs1plm5crlgd88sm1ymlqc3gs09mr2n456z9z"}}, {"name": "dart", "source": {"git": "https://github.com/UserNobody14/tree-sitter-dart", "rev": "2d7f66651c9319c1a0e4dda226cc2628fbb66528", "sha256": "16shxpm2jbq2qscr2pxjh5kzqf9cw6p8k1divg91nnbqhxkghfbs"}}, {"name": "scala", "source": {"git": "https://github.com/tree-sitter/tree-sitter-scala", "rev": "f6bbf35de41653b409ca9a3537a154f2b095ef64", "sha256": "09nhmil016nqdh389ral30ymmaap07vzvab0di899khg8bjq7l8q"}}, {"name": "dockerfile", "source": {"git": "https://github.com/camdencheek/tree-sitter-dockerfile", "rev": "8ee3a0f7587b2bd8c45c8cb7d28bd414604aec62", "sha256": "0izv8fryh7vivh9nbpzqpxb74fanrnd21bbq8xzazz4dvgfd7g93"}}, {"name": "git-commit", "source": {"git": "https://github.com/the-mikedavis/tree-sitter-git-commit", "rev": "db88cffa3952dd2328b741af5d0fc69bdb76704f", "sha256": "08w9kkmarm5g6hi5yxk4nspkq0k0vxk7kjwvbzdifiphrs5pzf5g"}}, {"name": "diff", "source": {"git": "https://github.com/the-mikedavis/tree-sitter-diff", "rev": "fd74c78fa88a20085dbc7bbeaba066f4d1692b63", "sha256": "0lbadj3657yk6r46sffbzkmm1kp47rydhsn1bj1w1mnyr27bfvrf"}}, {"name": "git-rebase", "source": {"git": "https://github.com/the-mikedavis/tree-sitter-git-rebase", "rev": "d8a4207ebbc47bd78bacdf48f883db58283f9fd8", "sha256": "16g3i69jxq7fm2nis2d61bcj1r84sbr1drbmjd6zwm8rxkdnxd4r"}}, {"name": "regex", "source": {"git": "https://github.com/tree-sitter/tree-sitter-regex", "rev": "e1cfca3c79896ff79842f057ea13e529b66af636", "sha256": "0j6j0h8ciyhgmcq9iy3843anyfvd7s0biqzgbsqgwbgbqbg2nfwl"}}, {"name": "git-config", "source": {"git": "https://github.com/the-mikedavis/tree-sitter-git-config", "rev": "0e4f0baf90b57e5aeb62dcdbf03062c6315d43ea", "sha256": "0hp45mvzbnpzjzxikwzyb7jzv4fyz19jllj78qm35sba4yc942ym"}}, {"name": "gitattributes", "source": {"git": "https://github.com/mtoohey31/tree-sitter-gitattributes", "rev": "3dd50808e3096f93dccd5e9dc7dc3dba2eb12dc4", "sha256": "1idi1hrpkc17y5vi2h0vfwzw64w6wy4cz4yk08avqnms6mxkxq94"}}, {"name": "gitignore", "source": {"git": "https://github.com/shunsambongi/tree-sitter-gitignore", "rev": "f4685bf11ac466dd278449bcfe5fd014e94aa504", "sha256": "17rar33y4dngmx69kjiw6wgrsd6kc0c8w4xa4rx06rjmv7b1hfij"}}, {"name": "graphql", "source": {"git": "https://github.com/bkegley/tree-sitter-graphql", "rev": "5e66e961eee421786bdda8495ed1db045e06b5fe", "sha256": "0xvrd6p9rxdjpqfq575ap6hpl2f7dad5i4d4m05w1qk9jx33vw9n"}}, {"name": "elm", "source": {"git": "https://github.com/elm-tooling/tree-sitter-elm", "rev": "df4cb639c01b76bc9ac9cc66788709a6da20002c", "sha256": "14il4yv65w7l29s84ilp3w3v9hy7x8j2bg73wwjyazava6n0f41y"}}, {"name": "iex", "source": {"git": "https://github.com/elixir-lang/tree-sitter-iex", "rev": "39f20bb51f502e32058684e893c0c0b00bb2332c", "sha256": "10lwwh3v2cc39hcydz5p899grzy50gr46bbddhs9vaam7wrp25b1"}}, {"name": "rescript", "source": {"git": "https://github.com/jaredramirez/tree-sitter-rescript", "rev": "65609807c628477f3b94052e7ef895885ac51c3c", "sha256": "0d8whkyyvjf270m6zr3jhc1s5zdwsf05dfnzs5r3jzb6qmm52x2k"}}, {"name": "erlang", "source": {"git": "https://github.com/the-mikedavis/tree-sitter-erlang", "rev": "ce0ed253d72c199ab93caba7542b6f62075339c4", "sha256": "04l9svgmk8z5vgb2mvcfwijdl7jmyqi9cgfzzyak0z011f4f9zhi"}}, {"name": "kotlin", "source": {"git": "https://github.com/fwcd/tree-sitter-kotlin", "rev": "a4f71eb9b8c9b19ded3e0e9470be4b1b77c2b569", "sha256": "051x0p02dkx0rz83sy70wczm6k5b938q4knhh8halv2acs32l4v9"}}, {"name": "hcl", "source": {"git": "https://github.com/MichaHoffmann/tree-sitter-hcl", "rev": "3cb7fc28247efbcb2973b97e71c78838ad98a583", "sha256": "0hg7w3hsvxjwz1rb1izknn46msm4mkjx2cnq603lzn7i9mb1pbyr"}}, {"name": "org", "source": {"git": "https://github.com/milisims/tree-sitter-org", "rev": "698bb1a34331e68f83fc24bdd1b6f97016bb30de", "sha256": "0adzb2kw8k3w75p5f3ax9lal64k8n2fwrmrqak2z2w8jl8cgagl6"}}, {"name": "solidity", "source": {"git": "https://github.com/JoranHonig/tree-sitter-solidity", "rev": "9004b86531cb424bd379424cf7266a4585f2af7d", "sha256": "056srr5z0fz9pz3fwrbzx095jj7f5zsm20qb8y8pdar5lkzy5ipw"}}, {"name": "gleam", "source": {"git": "https://github.com/gleam-lang/tree-sitter-gleam", "rev": "ae79782c00656945db69641378e688cdb78d52c1", "sha256": "10lzz5jw7vh3laa721x7312y9irgi88w147cj7fj3g6q14wlsg7k"}}, {"name": "robot", "source": {"git": "https://github.com/Hubro/tree-sitter-robot", "rev": "f1142bfaa6acfce95e25d2c6d18d218f4f533927", "sha256": "1pnrycxsx5hapxfdj2n3nrjym550yb4ppfml8zvllj3cjqagrp9m"}}, {"name": "r", "source": {"git": "https://github.com/r-lib/tree-sitter-r", "rev": "cc04302e1bff76fa02e129f332f44636813b0c3c", "sha256": "0adq1qng3ghb4wvglplj73q8c95hzpfiqb2q8bqnms81i7p2xma7"}}, {"name": "swift", "source": {"git": "https://github.com/alex-pinkus/tree-sitter-swift", "rev": "77c6312c8438f4dbaa0350cec92b3d6dd3d74a66", "sha256": "1fblqm8hyd6hbydzpcpm3lmlhfcifsq31r3ibvhgckfl64afhckv"}}, {"name": "embedded-template", "source": {"git": "https://github.com/tree-sitter/tree-sitter-embedded-template", "rev": "d21df11b0ecc6fd211dbe11278e92ef67bd17e97", "sha256": "0h3nj6fz512riyx2b65pg9pjprkpkasnglwljlzi6s1in9fdig3x"}}, {"name": "eex", "source": {"git": "https://github.com/connorlay/tree-sitter-eex", "rev": "f742f2fe327463335e8671a87c0b9b396905d1d1", "sha256": "19n07ywavwkh4p189d18wxhch45qgn094b7mkdymh60zr7cbmyjh"}}, {"name": "heex", "source": {"git": "https://github.com/phoenixframework/tree-sitter-heex", "rev": "2e1348c3cf2c9323e87c2744796cf3f3868aa82a", "sha256": "04yzzqfxinsh62l7750grflxg809m8y3qlbmc1vknk2xk34l9d78"}}, {"name": "sql", "source": {"git": "https://github.com/DerekStride/tree-sitter-sql", "rev": "3a3f92b29c880488a08bc2baaf1aca6432ec3380", "sha256": "1jy9c553b2fzv7q9n8b0hs0yr00xd5mhd1v2lbbcfrk7x9jfrnsi"}}, {"name": "gdscript", "source": {"git": "https://github.com/PrestonKnopp/tree-sitter-gdscript", "rev": "a4b57cc3bcbfc24550e858159647e9238e7ad1ac", "sha256": "0mppjapxsdch9wwqklnfb0cs7xwja333w6wzygykzrb7nna50lfz"}}, {"name": "godot-resource", "source": {"git": "https://github.com/PrestonKnopp/tree-sitter-godot-resource", "rev": "b6ef0768711086a86b3297056f9ffb5cc1d77b4a", "sha256": "0agnvg95fx60xkr5fivl1x3yhcw6ca58f7bpx3dq6fl7pyfgrky2"}}, {"name": "nu", "source": {"git": "https://github.com/LhKipp/tree-sitter-nu", "rev": "eb95bdac3abd73ef47e53f19c63e74a31405ebd2", "sha256": "06rhwprkyr0snkynq3ialgycynp8b4i95sxyqfbj7qvj49vnc6nq"}}, {"name": "vala", "source": {"git": "https://github.com/vala-lang/tree-sitter-vala", "rev": "c9eea93ba2ec4ec1485392db11945819779745b3", "sha256": "0xzszj8c5nkk8nccspbiz68aw3ki6pi75ngwrrfqdipxy7ncd70j"}}, {"name": "hare", "source": {"git": "https://git.sr.ht/~ecmma/tree-sitter-hare", "rev": "bc26a6a949f2e0d98b7bfc437d459b250900a165", "sha256": "0hlir7xw14xdm7jxchqr228zln8ag73lv45b0x8a2v9iac2smjdv"}}, {"name": "devicetree", "source": {"git": "https://github.com/joelspadin/tree-sitter-devicetree", "rev": "877adbfa0174d25894c40fa75ad52d4515a36368", "sha256": "1ds7pa4x1yd54xa2mba37vp8lbi8n4l975lps0249x8xw35r0jrl"}}, {"name": "cairo", "source": {"git": "https://github.com/archseer/tree-sitter-cairo", "rev": "b249662a1eefeb4d71c9529cdd971e74fecc10fe", "sha256": "1vgwr3qm1y1ajrma3wlnkwrwg5466mkm35pqzb39vlcgh1575xrv"}}, {"name": "cpon", "source": {"git": "https://github.com/fvacek/tree-sitter-cpon", "rev": "0d01fcdae5a53191df5b1349f9bce053833270e7", "sha256": "1ar8dfjjg1pp9i403jm21d4b70xi2w4kjdmwnxlc597582jkjx56"}}, {"name": "odin", "source": {"git": "https://github.com/ap29600/tree-sitter-odin", "rev": "b219207e49ffca2952529d33e94ed63b1b75c4f1", "sha256": "1wj8fb0dk1c5dzkn165pbk4qky77bzqnpvv30981zgjszl508r1l"}}, {"name": "meson", "source": {"git": "https://github.com/staysail/tree-sitter-meson", "rev": "32a83e8f200c347232fa795636cfe60dde22957a", "sha256": "0g1kc1hidva3ipi4nsi64r9pm8jc48nmhffqshwvbiss0fdf8ac9"}}, {"name": "sshclientconfig", "source": {"git": "https://github.com/metio/tree-sitter-ssh-client-config", "rev": "e45c6d5c71657344d4ecaf87dafae7736f776c57", "sha256": "1gbvzdysdz2gri7k2bxjchn34cdh0l7y4rfxgs0s8nxz73fpyfaj"}}, {"name": "scheme", "source": {"git": "https://github.com/6cdh/tree-sitter-scheme", "rev": "c0741320bfca6b7b5b7a13b5171275951e96a842", "sha256": "12knvhmayck9da3zj2w55al4yjhkkr9gxmfdmrjiz7vn9wc1dxr9"}}, {"name": "v", "source": {"git": "https://github.com/vlang/vls", "subpath": "tree_sitter_v", "rev": "66cf9d3086fb5ecc827cb32c64c5d812ab17d2c6", "sha256": "11g9wxvia39f5sik7zxl1v06kks8s9rqp5ip6g6z26wz1585vlzx"}}, {"name": "verilog", "source": {"git": "https://github.com/andreytkachenko/tree-sitter-verilog", "rev": "514d8d70593d29ef3ef667fa6b0e504ae7c977e3", "sha256": "0abnfll1kl7kn0sg8bpmhahszgfyh2s2ld930pb5z6706lsg07pp"}}, {"name": "edoc", "source": {"git": "https://github.com/the-mikedavis/tree-sitter-edoc", "rev": "74774af7b45dd9cefbf9510328fc6ff2374afc50", "sha256": "1qz6hghnyhrgm23793hyw84zxzrhb3jc1prih806hirzybbapc80"}}, {"name": "jsdoc", "source": {"git": "https://github.com/tree-sitter/tree-sitter-jsdoc", "rev": "189a6a4829beb9cdbe837260653b4a3dfb0cc3db", "sha256": "0qpsy234p30j6955wpjlaqwbr21bi56p0ln5vhrd84s99ac7s6b6"}}, {"name": "openscad", "source": {"git": "https://github.com/bollian/tree-sitter-openscad", "rev": "5c3ce93df0ac1da7197cf6ae125aade26d6b8972", "sha256": "1bimdd71899i454k9638jg5m97scxcvqsn4szy1i9d0lwx8wp05p"}}, {"name": "prisma", "source": {"git": "https://github.com/victorhqc/tree-sitter-prisma", "rev": "eca2596a355b1a9952b4f80f8f9caed300a272b5", "sha256": "19zb3dkwp2kpyivygqxk8yph0jpl7hn9zzcry15mshn2n0rs9sih"}}, {"name": "clojure", "source": {"git": "https://github.com/sogaiu/tree-sitter-clojure", "rev": "e57c569ae332ca365da623712ae1f50f84daeae2", "sha256": "0hq8rv4s0gzbfv3qj4gsrm87baiy6k1hyfbhbbpwbrcpd8jl7gdn"}}, {"name": "elvish", "source": {"git": "https://github.com/ckafi/tree-sitter-elvish", "rev": "e50787cadd3bc54f6d9c0704493a79078bb8a4e5", "sha256": "1xw9mqq3p64lgli6nvlavrrlg29nfj2fbg7rr2jw1jcjk8lgxv1p"}}, {"name": "fortran", "source": {"git": "https://github.com/stadelmanma/tree-sitter-fortran", "rev": "f0f2f100952a353e64e26b0fa710b4c296d7af13", "sha256": "17iiz38s7adkzv9rw97nn5nd9kvn1vyccm7r6ywipaa5aim0nm6a"}}, {"name": "ungrammar", "source": {"git": "https://github.com/Philipp-M/tree-sitter-ungrammar", "rev": "0113de880a58ea14f2a75802e9b99fcc25003d9c", "sha256": "1lbrnsqmfhgwad78c6r8dxv1d9g2dgpbdd6qyj7sgmx43khv2vw4"}}, {"name": "dot", "source": {"git": "https://github.com/rydesun/tree-sitter-dot", "rev": "917230743aa10f45a408fea2ddb54bbbf5fbe7b7", "sha256": "1q2rbv16dihlmrbxlpn0x03na7xp8rdhf58vwm3lryn3nfcjckn2"}}, {"name": "cue", "source": {"git": "https://github.com/eonpatapon/tree-sitter-cue", "rev": "61843e3beebf19417e4fede4e8be4df1084317ad", "sha256": "15cmlkip9nl6yxkbkv0lp7prfyrhri94szqg3vn7a90s4zjkfx99"}}, {"name": "slint", "source": {"git": "https://github.com/jrmoulton/tree-sitter-slint", "rev": "0d4dda94f96623302dfc234e06be62a5717f47da", "sha256": "0pvzm0zir1zf1pv4mjzcy95irdcs9ypj9m8i204szb7d3sfzkybz"}}, {"name": "task", "source": {"git": "https://github.com/alexanderbrevig/tree-sitter-task", "rev": "f2cb435c5dbf3ee19493e224485d977cb2d36d8b", "sha256": "0zg27cs6naj2laf2fa0xmxzg4xpkqpgj10f0va3ay7wzwm2004fc"}}, {"name": "xit", "source": {"git": "https://github.com/synaptiko/tree-sitter-xit", "rev": "7d7902456061bc2ad21c64c44054f67b5515734c", "sha256": "0lj3p8grbb8527k23mibn2cfxzrikpgwv4qmlcfnvsqqhqfc83w7"}}, {"name": "esdl", "source": {"git": "https://github.com/greym0uth/tree-sitter-esdl", "rev": "b840c8a8028127e0a7c6e6c45141adade2bd75cf", "sha256": "1dyqqjawnmd4xzs22c9agh9n40f636hjd5nbvrr17abphy52z349"}}, {"name": "pascal", "source": {"git": "https://github.com/Isopod/tree-sitter-pascal", "rev": "2fd40f477d3e2794af152618ccfac8d92eb72a66", "sha256": "11zjwk8wpx2b565sf82mh02bp5iswhmfykzdqfk0qwasr9ka2w7y"}}, {"name": "sml", "source": {"git": "https://github.com/Giorbo/tree-sitter-sml", "rev": "bd4055d5554614520d4a0706b34dc0c317c6b608", "sha256": "0yx0yb7cr0v2w8y8zi8nxsvwnwbbaj4fwaqffgky58pd665gvsbw"}}, {"name": "jsonnet", "source": {"git": "https://github.com/sourcegraph/tree-sitter-jsonnet", "rev": "0475a5017ad7dc84845d1d33187f2321abcb261d", "sha256": "1dh8wqi8mnsapzicrdjg6cj6skj9f2ia4ijg08pl45bcxc1lidzc"}}, {"name": "astro", "source": {"git": "https://github.com/virchau13/tree-sitter-astro", "rev": "5f5c3e73c45967df9aa42f861fad2d77cd4e0900", "sha256": "06nj6yzkmh0bl6whqazlx0a554h0zxk9zgrlkv4vmphvd714bc7y"}}, {"name": "bass", "source": {"git": "https://github.com/vito/tree-sitter-bass", "rev": "501133e260d768ed4e1fd7374912ed5c86d6fd90", "sha256": "14zs56rb53qzkx9l9hgpn41q2nycrrdh2jdbybq55w34gcgg6sh2"}}, {"name": "wat", "source": {"git": "https://github.com/wasm-lsp/tree-sitter-wasm", "rev": "2ca28a9f9d709847bf7a3de0942a84e912f59088", "subpath": "wat", "sha256": "02v08hs9wirdzfx9a7c3kpn0cpc9i867pw28qka0fid9q537hnbb"}}, {"name": "wast", "source": {"git": "https://github.com/wasm-lsp/tree-sitter-wasm", "rev": "2ca28a9f9d709847bf7a3de0942a84e912f59088", "subpath": "wast", "sha256": "02v08hs9wirdzfx9a7c3kpn0cpc9i867pw28qka0fid9q537hnbb"}}, {"name": "d", "source": {"git": "https://github.com/gdamore/tree-sitter-d", "rev": "601c4a1e8310fb2f3c43fa8a923d0d27497f3c04", "sha256": "1ml1589pjb2sknsmz770ywfw37dvypnf1576qs9473r6cj4ng496"}}, {"name": "vhs", "source": {"git": "https://github.com/charmbracelet/tree-sitter-vhs", "rev": "c6d81f34c011c29ee86dd73b45a8ecc9f2e2bdaf", "sha256": "1pdz99rdvjf82vyfsp7g6dsgjjibfj5w37rdyix41lvwiyh9nkgr"}}, {"name": "kdl", "source": {"git": "https://github.com/Unoqwy/tree-sitter-kdl", "rev": "e1cd292c6d15df6610484e1d4b5c987ecad52373", "sha256": "13gj38j0lplnvf432smr50z84brfz2ld28qvqvhy6j6hd09b9xk3"}}, {"name": "xml", "source": {"git": "https://github.com/RenjiSann/tree-sitter-xml", "rev": "48a7c2b6fb9d515577e115e6788937e837815651", "sha256": "04jpcxmb9pwam5q6l6s5kvmkzfcnar8yvl3xm5i5rjnzfyvdgkzi"}}, {"name": "dtd", "source": {"git": "https://github.com/KMikeeU/tree-sitter-dtd", "rev": "6116becb02a6b8e9588ef73d300a9ba4622e156f", "sha256": "1gs1gkk20khmvz10ikhym9yqkcn5km5hq4hz4jyxdz67jzpbbbls"}}, {"name": "wit", "source": {"git": "https://github.com/hh9527/tree-sitter-wit", "rev": "c917790ab9aec50c5fd664cbfad8dd45110cfff3", "sha256": "08bpcmg2hdc8fyglhy311cx5i1brc798h8aicaxk52wgypv31rz7"}}, {"name": "ini", "source": {"git": "https://github.com/justinmk/tree-sitter-ini", "rev": "4d247fb876b4ae6b347687de4a179511bf67fcbc", "sha256": "08z3281q9vq3lr3mcj4cm6zh2bsg9jhyrxfqfann9ixklvzglkn6"}}, {"name": "bicep", "source": {"git": "https://github.com/the-mikedavis/tree-sitter-bicep", "rev": "d8e097fcfa143854861ef737161163a09cc2916b", "sha256": "1zm5i4723afmd95lg1xlrh0v2rdy116l87m4jcdfzzynls57zdhp"}}, {"name": "qmljs", "source": {"git": "https://github.com/yuja/tree-sitter-qmljs", "rev": "0b2b25bcaa7d4925d5f0dda16f6a99c588a437f1", "sha256": "0sgylcj8bfsiyjh11cfzpzywk66xi9clvbcihryk6qkpndz0pzqx"}}, {"name": "mermaid", "source": {"git": "https://github.com/monaqa/tree-sitter-mermaid", "rev": "d787c66276e7e95899230539f556e8b83ee16f6d", "sha256": "106w00y6l1fnjakaz9biqk546h2xy0yzr3wmg0yz6fihzj6kf117"}}, {"name": "matlab", "source": {"git": "https://github.com/mstanciu552/tree-sitter-matlab", "rev": "2d5d3d5193718a86477d4335aba5b34e79147326", "sha256": "1iab96dkf4zbcza4xpai76y7fy5kvgmv4ibjpa3ij588fcbvz5j6"}}, {"name": "ponylang", "source": {"git": "https://github.com/mfelsche/tree-sitter-ponylang", "rev": "ef66b151bc2604f431b5668fcec4747db4290e11", "sha256": "08g0a3kmv71rq86sizyikzsv5h2bdg8vcdiln7vrl482dczgxaky"}}, {"name": "dhall", "source": {"git": "https://github.com/jbellerb/tree-sitter-dhall", "rev": "affb6ee38d629c9296749767ab832d69bb0d9ea8", "sha256": "0r4f4w2jhm2hyvh3r3phdjhigsh0an8g4p21cbz8ldkld8ma9lxb"}}, {"name": "pem", "source": {"git": "https://github.com/mtoohey31/tree-sitter-pem", "rev": "be67a4330a1aa507c7297bc322204f936ec1132c", "sha256": "144gsh1cw3vzrgy95fvx7ld6gp0fq1v0mzmll0liiqgyrjsxda3h"}}, {"name": "passwd", "source": {"git": "https://github.com/ath3/tree-sitter-passwd", "rev": "20239395eacdc2e0923a7e5683ad3605aee7b716", "sha256": "03j18mx4g901q70kpy39hayh4snwis62svx6ir5015cvjz4fwiyx"}}, {"name": "hosts", "source": {"git": "https://github.com/ath3/tree-sitter-hosts", "rev": "301b9379ce7dfc8bdbe2c2699a6887dcb73953f9", "sha256": "0sgpybvwrvpw0lvk2s96ppyh8132g2vfjyif43yg08zlj06mvjbz"}}, {"name": "uxntal", "source": {"git": "https://github.com/Jummit/tree-sitter-uxntal", "rev": "9297e95ef74380b0ad84c4fd98f91e9f6e4319e6", "sha256": "1y6iws0z8likm8n1v6mi2jma5c7jvga04d9k30xqifpln8hm4qad"}}, {"name": "yuck", "source": {"git": "https://github.com/Philipp-M/tree-sitter-yuck", "rev": "e3d91a3c65decdea467adebe4127b8366fa47919", "sha256": "12zf5zqxh6farah2michxjhaxf97bal3x2pgrzfcp0wxz6fkns4z"}}, {"name": "prql", "source": {"git": "https://github.com/PRQL/tree-sitter-prql", "rev": "3f27cac466f030ee7d985d91eba5470e01dd21ea", "sha256": "0gp7z7ymqf15wagbik480hxm8p9xxlzkbnk7204742hdrl111zl6"}}, {"name": "po", "source": {"git": "https://github.com/erasin/tree-sitter-po", "rev": "417cee9abb2053ed26b19e7de972398f2da9b29e", "sha256": "1sm6hcyma29rw6shim4h27s0pmyby1yy4bjn9dcv9362xvanhacb"}}, {"name": "nasm", "source": {"git": "https://github.com/naclsn/tree-sitter-nasm", "rev": "a0db15db6fcfb1bf2cc8702500e55e558825c48b", "sha256": "1q4xcl0ypf0als770zpg0vv0pfxr2ysxl2vqxhc3m84s3id31sav"}}, {"name": "rst", "source": {"git": "https://github.com/stsewd/tree-sitter-rst", "rev": "25e6328872ac3a764ba8b926aea12719741103f1", "sha256": "0f53jmpjh2kcl9srwwwb7a5k24729ig96m87qjj99myqfnzahw43"}}, {"name": "capnp", "source": {"git": "https://github.com/amaanq/tree-sitter-capnp", "rev": "fc6e2addf103861b9b3dffb82c543eb6b71061aa", "sha256": "1gcz5v7i1imdsd7vxzj41iflsxx77zvvy9ngn95l8kg6rz8y3b0l"}}, {"name": "smithy", "source": {"git": "https://github.com/indoorvivants/tree-sitter-smithy", "rev": "cf8c7eb9faf7c7049839585eac19c94af231e6a0", "sha256": "0k7gfpa3pcj1ji34k0kwk1xbadkgjadfg36xfwns1fmlwzmr7jnx"}}, {"name": "vhdl", "source": {"git": "https://github.com/teburd/tree-sitter-vhdl", "rev": "c57313adee2231100db0a7880033f6865deeadb2", "sha256": "142flxd5yqg5aqx507wgqfkmgykjw5kwjq44s1g2gdgscjq4bm64"}}, {"name": "rego", "source": {"git": "https://github.com/FallenAngel97/tree-sitter-rego", "rev": "b2667c975f07b33be3ceb83bea5cfbad88095866", "sha256": "18qw5ahx6qcfq9gs6gcakl178gnnryksv6gyamyd6vypz20kwz6b"}}, {"name": "nim", "source": {"git": "https://github.com/aMOPel/tree-sitter-nim", "rev": "240239b232550e431d67de250d1b5856209e7f06", "sha256": "0gryfjqm2x9biqipzjqhasizm0zlg4b3lykcf2w8bv6wc0q0mbsh"}}, {"name": "hurl", "source": {"git": "https://github.com/pfeiferj/tree-sitter-hurl", "rev": "264c42064b61ee21abe88d0061f29a0523352e22", "sha256": "1figdv60w1a8nyfkqih1rsyzd9xq2dpcyv9l75ddja7k09p0rzsz"}}, {"name": "markdoc", "source": {"git": "https://github.com/markdoc-extra/tree-sitter-markdoc", "rev": "5ffe71b29e8a3f94823913ea9cea51fcfa7e3bf8", "sha256": "0xrrkxjbchbaj04z94l91d79jrrwx6zkafcbwig5851lfzsjbadc"}}, {"name": "opencl", "source": {"git": "https://github.com/lefp/tree-sitter-opencl", "rev": "8e1d24a57066b3cd1bb9685bbc1ca9de5c1b78fb", "sha256": "0pqfjd3sn1m8pqkj5hc3bf235jk8v7llh0xmw4470v8v2hw8ladp"}}, {"name": "just", "source": {"git": "https://github.com/IndianBoy42/tree-sitter-just", "rev": "8af0aab79854aaf25b620a52c39485849922f766", "sha256": "15hl3dsr5kxjl1kl9md2gb9bwj0ni54d9k6jv1h74b3psf4qb0l5"}}] diff --git a/pkgs/applications/editors/helix/update.py b/pkgs/applications/editors/helix/update.py new file mode 100755 index 000000000000..196a393ae83c --- /dev/null +++ b/pkgs/applications/editors/helix/update.py @@ -0,0 +1,47 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p nix-update python3 python3Packages.requests python3.pkgs.tomlkit nix-prefetch-git +import tomlkit +import json +import requests +import subprocess +from pathlib import Path + +latest_release_url = "https://api.github.com/repos/helix-editor/helix/releases/latest" + + +def get_latest_release(): + res = requests.get(latest_release_url) + res.raise_for_status() + return res.json()["tag_name"] + + +def get_grammar_config(): + res = requests.get(f"https://raw.githubusercontent.com/helix-editor/helix/{version}/languages.toml") + res.raise_for_status() + return tomlkit.parse(res.text)["grammar"] + + +def calculate_sha256(url, rev): + out = subprocess.check_output([ + "nix-prefetch-git", "--quiet", + "--url", url, + "--rev", rev]) + return json.loads(out)["sha256"] + + +version = get_latest_release() +grammars = get_grammar_config() +for grammar in grammars: + if grammar["source"].get("git") is not None: + grammar["source"]["sha256"] = calculate_sha256( + grammar["source"]["git"], grammar["source"]["rev"]) + +json_grammars = json.dumps(grammars) + +with open(Path(__file__).parent / "language-grammars.json", "w") as file: + file.write(json_grammars + "\n") + +subprocess.run([ + "nix-update", "helix", + "--version", version, +]) From 58228cf8b22560282a7f4f3d8e5a9f68a4326798 Mon Sep 17 00:00:00 2001 From: jarkad Date: Sat, 20 May 2023 22:01:45 +0300 Subject: [PATCH 28/51] nbxmpp: 4.0.1 -> 4.2.2 --- pkgs/development/python-modules/nbxmpp/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 68d3ca60342a..bd8691857fa8 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -8,12 +8,13 @@ , precis-i18n , pygobject3 , pyopenssl +, setuptools , pytestCheckHook }: buildPythonPackage rec { pname = "nbxmpp"; - version = "4.0.1"; + version = "4.2.2"; disabled = pythonOlder "3.10"; @@ -22,9 +23,11 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = version; - hash = "sha256-PL+qNxeNubGSLqSci4uhRWtOIqs10p+A1VPfTwCLu84="; + hash = "sha256-ZTX8plcsO4zE7ruLtWIvsagQUvwPHuKdPKRwCrFwvgc="; }; + format = "pyproject"; + nativeBuildInputs = [ # required for pythonImportsCheck otherwise libsoup cannot be found gobject-introspection @@ -40,6 +43,7 @@ buildPythonPackage rec { libsoup_3 pygobject3 pyopenssl + setuptools ]; nativeCheckInputs = [ From b8733cfa6cbb959b1a590f4d80db082474e07548 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 May 2023 19:16:52 +0000 Subject: [PATCH 29/51] buf: 1.18.0 -> 1.19.0 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 3b3e4a21fbcd..3e052c48dbac 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.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-wMYl9TlOQ4h5MFNNWaGkou7YIBSsMfhV70ABgKkC7xo="; + hash = "sha256-vLiOAlzIrIwMKPn8yl/YyFmXbFHFAZB1yLejQbAEivg="; }; - vendorHash = "sha256-pyhK0tHpHrEkGRkWgzTFg9FNNBx3SwoWUfw+2zk7nAs="; + vendorHash = "sha256-DT3vffs33hGlylQLKc5o7Xble8Blyy4hgvE27CHnmJc="; patches = [ # Skip a test that requires networking to be available to work. From 93b61e55f3fa530f7a3cd9c77e2186ad3bb3ebbf Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Sat, 20 May 2023 15:32:00 -0400 Subject: [PATCH 30/51] python311Packages.fn: disable --- pkgs/development/python-modules/fn/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/fn/default.nix b/pkgs/development/python-modules/fn/default.nix index 0acdf24d9542..e7a0d4c0416d 100644 --- a/pkgs/development/python-modules/fn/default.nix +++ b/pkgs/development/python-modules/fn/default.nix @@ -2,12 +2,17 @@ , buildPythonPackage , fetchpatch , fetchPypi +, pythonAtLeast }: buildPythonPackage rec { pname = "fn"; version = "0.4.3"; + # Python 3.11 changed the API of the `inspect` module and fn was never + # updated to adapt; last commit was in 2014. + disabled = pythonAtLeast "3.11"; + src = fetchPypi { inherit pname version; sha256 = "1nmsjmn8jb4gp22ksx0j0hhdf4y0zm8rjykyy2i6flzimg6q1kgq"; From 2fa279fbf31d4f9b7492b4a49a887666412473c2 Mon Sep 17 00:00:00 2001 From: jarkad Date: Sat, 20 May 2023 22:01:54 +0300 Subject: [PATCH 31/51] gajim: 1.6.1 -> 1.7.3 --- .../doc/manual/release-notes/rl-2305.section.md | 2 ++ .../instant-messengers/gajim/default.nix | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 838bda5c914f..4fd7d455df08 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -190,6 +190,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `nushell` has been updated to at least version 0.77.0, which includes potential breaking changes in aliases. The old aliases are now available as `old-alias` but it is recommended you migrate to the new format. See [Reworked aliases](https://www.nushell.sh/blog/2023-03-14-nushell_0_77.html#reworked-aliases-breaking-changes-kubouch). +- `gajim` has been updated to version 1.7.3 which has disabled legacy ciphers. See [changelog for version 1.7.0](https://dev.gajim.org/gajim/gajim/-/releases/1.7.0). + - `keepassx` and `keepassx2` have been removed, due to upstream [stopping development](https://www.keepassx.org/index.html%3Fp=636.html). Consider [KeePassXC](https://keepassxc.org) as a maintained alternative. - The [services.kubo.settings](#opt-services.kubo.settings) option is now no longer stateful. If you changed any of the options in [services.kubo.settings](#opt-services.kubo.settings) in the past and then removed them from your NixOS configuration again, those changes are still in your Kubo configuration file but will now be reset to the default. If you're unsure, you may want to make a backup of your configuration file (probably /var/lib/ipfs/config) and compare after the update. diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 091bbf66e3d9..bc3269721b77 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,13 +22,15 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.6.1"; + version = "1.7.3"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - hash = "sha256-3D87Ou/842WqbaUiJV1hRZFVkZzQ12GXCpRc8F3rKPQ="; + hash = "sha256-t8yzWfdsY8pXye7Dn5hME0bOHgf+MzuyVY3hweXc0xg="; }; + format = "pyproject"; + buildInputs = [ gobject-introspection gtk3 gnome.adwaita-icon-theme gtksourceview4 @@ -58,6 +60,14 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = [ xvfb-run dbus ]; + preBuild = '' + python pep517build/build_metadata.py -o dist/metadata + ''; + + postInstall = '' + python pep517build/install_metadata.py dist/metadata --prefix=$out + ''; + checkPhase = '' xvfb-run dbus-run-session \ --config-file=${dbus}/share/dbus-1/session.conf \ @@ -65,6 +75,9 @@ python3.pkgs.buildPythonApplication rec { ${python3.interpreter} -m unittest discover -s test/common -v ''; + # test are broken in 1.7.3 + doCheck = false; + # necessary for wrapGAppsHook strictDeps = false; From c20f48fdb293988b5778e6d6e3ef2e99539c2327 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Sat, 20 May 2023 15:39:26 -0400 Subject: [PATCH 32/51] python3Packages.timelib: 0.2.5 -> 0.3.0 --- pkgs/development/python-modules/timelib/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/timelib/default.nix b/pkgs/development/python-modules/timelib/default.nix index e2f3cc1d3cc8..e0f76c0c2e65 100644 --- a/pkgs/development/python-modules/timelib/default.nix +++ b/pkgs/development/python-modules/timelib/default.nix @@ -1,18 +1,22 @@ { lib , buildPythonPackage +, cython , fetchPypi }: buildPythonPackage rec { pname = "timelib"; - version = "0.2.5"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "6ac9f79b09b63bbc07db88525c1f62de1f6d50b0fd9937a0cb05e3d38ce0af45"; + hash = "sha256-0bInBlVxhuYFjaiLoPhYN0AbKuneFX9ZNT3JeNglGHo="; }; + nativeBuildInputs = [ + cython + ]; + meta = with lib; { description = "Parse english textual date descriptions"; homepage = "https://github.com/pediapress/timelib/"; From 4a6077e77f54582de7ee1d938061ddc1903ece61 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 May 2023 21:49:16 +0200 Subject: [PATCH 33/51] go-exploitdb: init at 0.4.5 --- pkgs/tools/security/go-exploitdb/default.nix | 32 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/security/go-exploitdb/default.nix diff --git a/pkgs/tools/security/go-exploitdb/default.nix b/pkgs/tools/security/go-exploitdb/default.nix new file mode 100644 index 000000000000..345b40fbaf14 --- /dev/null +++ b/pkgs/tools/security/go-exploitdb/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "go-exploitdb"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "vulsio"; + repo = "go-exploitdb"; + rev = "refs/tags/v${version}"; + hash = "sha256-iBOpgeL/cLoQufla0MpQs/0icRWUj1HngnAwOcKLSsQ="; + }; + + vendorHash = "sha256-e+E8qcc5sRlb9clOFUrOzVwJlp3AFnZ6/lNAxaBe+hQ="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/vulsio/go-exploitdb/config.Version=${version}" + ]; + + meta = with lib; { + description = "Tool for searching Exploits from Exploit Databases, etc"; + homepage = "https://github.com/vulsio/go-exploitdb"; + changelog = "https://github.com/vulsio/go-exploitdb/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be33c1d3d065..778ec87f7fe6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35698,6 +35698,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit; }; + go-exploitdb = callPackage ../tools/security/go-exploitdb { }; + groestlcoin = libsForQt5.callPackage ../applications/blockchains/groestlcoin { boost = boost17x; withGui = true; From b182c03d1c65199ea223cc4b0a81e4ea8643b1f8 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Sat, 20 May 2023 15:52:28 -0400 Subject: [PATCH 34/51] python311Packages.virtualenv-clone: fix tests --- pkgs/development/python-modules/virtualenv-clone/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index da312bc20763..1c464101bf7e 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -19,7 +19,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace tests/__init__.py \ - --replace "'virtualenv'" "'${virtualenv}/bin/virtualenv'" + --replace "'virtualenv'" "'${virtualenv}/bin/virtualenv'" \ + --replace "'3.9', '3.10']" "'3.9', '3.10', '3.11']" # if the Python version used isn't in this list, tests fail substituteInPlace tests/test_virtualenv_sys.py \ --replace "'virtualenv'" "'${virtualenv}/bin/virtualenv'" From 8bf3e834daedadc6d0f4172616b2bdede1109c48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 May 2023 18:24:14 +0000 Subject: [PATCH 35/51] icewm: 3.3.4 -> 3.3.5 --- pkgs/applications/window-managers/icewm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index ea7c46b1ac95..8f171c29963d 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.3.4"; + version = "3.3.5"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-Ygu10QF+cbjA0qy3k8/A9QX5xSthXcPy0wII3tXLH68="; + hash = "sha256-ZxHeRfdSKhU7osITPLZmC5M2Nji3GjHLPuYphsZXNJw="; }; nativeBuildInputs = [ From 142c24711e90e29ded210331db5c41cfb10a1fe3 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sat, 20 May 2023 21:30:16 +0200 Subject: [PATCH 36/51] doc: fix typo --- doc/stdenv/stdenv.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 8c0a7f7f5bb7..a923da935ced 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1204,7 +1204,7 @@ Nix itself considers a build-time dependency as merely something that should pre In order to alleviate this burden, the setup hook mechanism was written, where any package can include a shell script that \[by convention rather than enforcement by Nix\], any downstream reverse-dependency will source as part of its build process. That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves. No boilerplate mirroring the list of dependencies is needed. -The setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. The combination of its power and implicit use may be expedient, but isn’t without costs. Nix itself is unchanged, but the spirit of added dependencies being effect-free is violated even if the letter isn’t. For example, if a derivation path is mentioned more than once, Nix itself doesn’t care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so. +The setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. The combination of its power and implicit use may be expedient, but isn’t without costs. Nix itself is unchanged, but the spirit of added dependencies being effect-free is violated even if the latter isn’t. For example, if a derivation path is mentioned more than once, Nix itself doesn’t care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so. The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper’s setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of `envBuildBuildHooks`, `envBuildHostHooks`, `envBuildTargetHooks`, `envHostHostHooks`, `envHostTargetHooks`, or `envTargetTargetHooks`. These 6 bash variables correspond to the 6 sorts of dependencies by platform (there’s 12 total but we ignore the propagated/non-propagated axis). From fb55842f43dd14e5c0a0b91d42d5f766a43c8285 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Sat, 20 May 2023 16:15:28 -0400 Subject: [PATCH 37/51] python3Packages.vmprof: fix build --- .../python-modules/vmprof/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index a9cc19f79c2e..17af0485c4ee 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , buildPythonPackage +, fetchpatch , fetchPypi , colorama , libunwind @@ -21,6 +22,22 @@ buildPythonPackage rec { buildInputs = [ libunwind ]; propagatedBuildInputs = [ colorama requests six pytz ]; + patches = [ + (fetchpatch { + name = "${pname}-python-3.10-compat.patch"; + # https://github.com/vmprof/vmprof-python/pull/198 + url = "https://github.com/vmprof/vmprof-python/commit/e4e99e5aa677f96d1970d88c8a439f995f429f85.patch"; + hash = "sha256-W/c6WtVuKi7xO2sCOr71mrZTWqI86bWg5a0FeDNolh0="; + }) + (fetchpatch { + name = "${pname}-python-3.11-compat.patch"; + # https://github.com/vmprof/vmprof-python/pull/251 (not yet merged) + url = "https://github.com/matthiasdiener/vmprof-python/compare/a1a1b5264ec0b197444c0053e44f8ae4ffed9353...13c39166363b960017393b614270befe01230be8.patch"; + excludes = [ "test_requirements.txt" ]; + hash = "sha256-3+0PVdAf83McNd93Q9dD4HLXt39UinVU5BA8jWfT6F4="; + }) + ]; + # No tests included doCheck = false; pythonImportsCheck = [ "vmprof" ]; From 3e7e852f453e53312efe70efa8d0a57b3c20429f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 May 2023 22:33:22 +0200 Subject: [PATCH 38/51] opendylan: mark broken The last successful build was over 2 years ago. --- pkgs/development/compilers/opendylan/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index 283ee2dffe47..fa0f98ea7fd2 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation { description = "A multi-paradigm functional and object-oriented programming language"; license = lib.licenses.mit; platforms = lib.platforms.linux; + broken = true; # last successful build 2020-12-11 }; } From b906d8a3a7002c79045b35ce46c95040286272f3 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Sat, 20 May 2023 22:35:50 +0200 Subject: [PATCH 39/51] pgmodeler: 1.0.3 -> 1.0.4 --- pkgs/applications/misc/pgmodeler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 367c0aee4082..fa6b1f86e03b 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-ZlIz+7YyER0/wQEkEe8XHYHcLK4vu09v1zkDrIgR/Dc="; + sha256 = "sha256-1d+zox46h22ox9zC+SvN3w3LkpHmN1jpf/tDPD5D80s="; }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; From 65c526958983f4bd2620d2c69fda5fe1950ada8b Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 20 May 2023 23:53:50 +0900 Subject: [PATCH 40/51] gnucash: fix finance-quote-wrapper exec --- .../office/gnucash/0004-exec-fq-wrapper.patch | 12 +++++++++--- pkgs/applications/office/gnucash/default.nix | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch b/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch index e18337c74226..e2b81538046b 100644 --- a/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch +++ b/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch @@ -1,5 +1,5 @@ diff --git a/libgnucash/app-utils/gnc-quotes.cpp b/libgnucash/app-utils/gnc-quotes.cpp -index 3003fca71f..e01cb10b50 100644 +index 3003fca71f..2f2b1398e1 100644 --- a/libgnucash/app-utils/gnc-quotes.cpp +++ b/libgnucash/app-utils/gnc-quotes.cpp @@ -122,7 +122,6 @@ private: @@ -10,7 +10,7 @@ index 3003fca71f..e01cb10b50 100644 std::string c_fq_wrapper; std::string m_version; StrVec m_sources; -@@ -145,7 +144,6 @@ static std::string parse_quotesource_error(const std::string& line); +@@ -145,13 +144,12 @@ static std::string parse_quotesource_error(const std::string& line); static const std::string empty_string{}; GncFQQuoteSource::GncFQQuoteSource() : @@ -18,6 +18,13 @@ index 3003fca71f..e01cb10b50 100644 m_version{}, m_sources{}, m_api_key{} { char *bindir = gnc_path_get_bindir(); + c_fq_wrapper = std::string(bindir) + "/finance-quote-wrapper"; + g_free(bindir); +- StrVec args{"-w", c_fq_wrapper, "-v"}; ++ StrVec args{"-v"}; + auto [rv, sources, errors] = run_cmd(args, empty_string); + if (rv) + { @@ -197,7 +195,7 @@ m_version{}, m_sources{}, m_api_key{} QuoteResult GncFQQuoteSource::get_quotes(const std::string& json_str) const @@ -43,4 +50,3 @@ index 3003fca71f..e01cb10b50 100644 bp::std_out > out_buf, bp::std_err > err_buf, bp::std_in < input_buf, - diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 64a02e811167..f80467d827d7 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { - Financial Calculations ''; license = licenses.gpl2Plus; - maintainers = with maintainers; [ domenkozar AndersonTorres rski ]; + maintainers = with maintainers; [ domenkozar AndersonTorres rski nevivurn ]; platforms = platforms.unix; }; } From 9060f35cdaed65cf742dc8d6f8e5a12f3aca70ef Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 20 May 2023 23:56:17 +0900 Subject: [PATCH 41/51] perlPackages.DateRange: init at 1.41 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 687abe240e9f..c9715944d27c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6162,6 +6162,20 @@ with self; { }; }; + DateRange = buildPerlPackage { + pname = "Date-Range"; + version = "1.41"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TM/TMTM/Date-Range-1.41.tar.gz"; + hash = "sha256-v5iXSSsQHAUDh50Up+fr6QJUQ4NgGufGmpXedcvZSLk="; + }; + propagatedBuildInputs = [ DateSimple ]; + meta = { + description = "work with a range of dates"; + license = with lib.licenses; [ gpl2Plus ]; + }; + }; + DateSimple = buildPerlPackage { pname = "Date-Simple"; version = "3.03"; From 5345c491e482d53deec5f2f356637d563e137002 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 20 May 2023 23:57:44 +0900 Subject: [PATCH 42/51] perlPackages.libwwwperl: init at 6.70 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c9715944d27c..2a47eb70596b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13100,6 +13100,22 @@ with self; { }; }; + libwwwperl = buildPerlPackage { + pname = "libwww-perl"; + version = "6.70"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SI/SIMBABQUE/libwww-perl-6.70.tar.gz"; + hash = "sha256-NPANI0R1e5wLVa01gI1T6T19kvekZOyDf+anPFH7WWk="; + }; + buildInputs = [ HTTPDaemon TestFatal TestNeeds TestRequiresInternet ]; + propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookieJar HTTPCookies HTTPDate HTTPMessage HTTPNegotiate LWPMediaTypes NetHTTP TryTiny URI WWWRobotRules ]; + meta = { + homepage = "https://github.com/libwww-perl/libwww-perl"; + description = "The World-Wide Web library for Perl"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + libxml_perl = buildPerlPackage { pname = "libxml-perl"; version = "0.08"; From de941a42753b777c5b6f4508d32686c2c4fdcbf3 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 20 May 2023 23:58:51 +0900 Subject: [PATCH 43/51] perlPackages.SpreadsheetXLSX: init at 0.17 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2a47eb70596b..f4a29b05e039 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21641,6 +21641,22 @@ with self; { }; }; + SpreadsheetXLSX = buildPerlPackage { + pname = "Spreadsheet-XLSX"; + version = "0.17"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AS/ASB/Spreadsheet-XLSX-0.17.tar.gz"; + hash = "sha256-M7d4knz/FjCQZbdOuMRpawNxZg0szf5FvkYFCSrO6XY="; + }; + buildInputs = [ TestNoWarnings TestWarnings ]; + propagatedBuildInputs = [ ArchiveZip SpreadsheetParseExcel ]; + meta = { + homepage = "https://github.com/asb-capfan/Spreadsheet-XLSX"; + description = "Perl extension for reading MS Excel 2007 files;"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + SQLAbstract = buildPerlPackage { pname = "SQL-Abstract"; version = "2.000001"; From 6827ad0aa5cf53d19f19e74391edca31e444fd17 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 20 May 2023 23:59:22 +0900 Subject: [PATCH 44/51] perlPackages.WebScraper: init at 0.38 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f4a29b05e039..474c4b1ed0b2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -27907,6 +27907,22 @@ with self; { }; }; + WebScraper = buildPerlModule { + pname = "Web-Scraper"; + version = "0.38"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Web-Scraper-0.38.tar.gz"; + hash = "sha256-+VtuX41/7r4RbQW/WaK3zxpR7Z0wvKgBI0MOxFZ1Q78="; + }; + buildInputs = [ ModuleBuildTiny TestBase TestRequires ]; + propagatedBuildInputs = [ HTMLParser HTMLSelectorXPath HTMLTagset HTMLTree HTMLTreeBuilderXPath UNIVERSALrequire URI XMLXPathEngine YAML libwwwperl ]; + meta = { + homepage = "https://github.com/miyagawa/web-scraper"; + description = "Web Scraping Toolkit using HTML and CSS Selectors or XPath expressions"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + WebServiceLinode = buildPerlModule { pname = "WebService-Linode"; version = "0.29"; From 03b689e3baa2803d4cc7a9c60fc99e881f22a0f0 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sun, 21 May 2023 00:00:34 +0900 Subject: [PATCH 45/51] perlPackages.FinanceQuote: 1.49 -> 1.55 --- pkgs/top-level/perl-packages.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 474c4b1ed0b2..3a6a76c5a023 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9857,17 +9857,18 @@ with self; { FinanceQuote = buildPerlPackage { pname = "Finance-Quote"; - version = "1.49"; + version = "1.55"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EC/ECOCODE/Finance-Quote-1.49.tar.gz"; - hash = "sha256-ldvERDumVjILNjxWYl0E83nJQ+IC9g9AoqNRUrVLv1M="; + url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-1.55.tar.gz"; + hash = "sha256-4uAAtnxmtq9Q1HYYWEkhEFEKVaAwqJEBfUDH3iGLdI8="; }; - propagatedBuildInputs = [ CGI DateTimeFormatStrptime HTMLTableExtract JSON JSONParse LWPProtocolHttps StringUtil TextTemplate ]; - buildInputs = [ TestPod ]; + buildInputs = [ DateManip DateRange DateSimple DateTime DateTimeFormatISO8601 StringUtil TestKwalitee TestPerlCritic TestPod TestPodCoverage ]; + propagatedBuildInputs = [ DateTimeFormatStrptime Encode HTMLTableExtract HTMLTokeParserSimple HTMLTree HTMLTreeBuilderXPath HTTPCookies JSON IOCompress LWPProtocolHttps Readonly StringUtil SpreadsheetXLSX TextTemplate TryTiny WebScraper XMLLibXML libwwwperl ]; meta = { homepage = "https://finance-quote.sourceforge.net/"; description = "Get stock and mutual fund quotes from various exchanges"; - license = with lib.licenses; [gpl2 ]; + license = with lib.licenses; [ gpl2Plus ]; + maintainers = with lib.maintainers; [ nevivurn ]; }; }; From b0f92293e9772839a06f6eaf92c0d5704420b84d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sat, 20 May 2023 16:58:39 +1000 Subject: [PATCH 46/51] rubyPackages.ruby-terminfo: fix ruby 3 build `rubyio.h` was a backwards compatibility hack, removed in recent versions. Use `ruby/io.h` instead. `rb_cData` was deprecated in https://bugs.ruby-lang.org/issues/18433 and removed in Ruby 3.2. --- pkgs/development/ruby-modules/gem-config/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 5dba1c0cf099..e1e8a8ec0bb9 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -649,6 +649,13 @@ in "--with-cflags=-I${ncurses.dev}/include" "--with-ldflags=-L${ncurses.out}/lib" ]; + dontBuild = false; + postPatch = '' + substituteInPlace extconf.rb --replace 'rubyio.h' 'ruby/io.h' + substituteInPlace terminfo.c \ + --replace 'rubyio.h' 'ruby/io.h' \ + --replace 'rb_cData' 'rb_cObject' + ''; }; ruby-vips = attrs: { From 1d4afe48fd2ca0a64b2744129b58f1dd440bcfe0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 May 2023 22:41:28 +0000 Subject: [PATCH 47/51] checkip: 0.45.1 -> 0.46.1 --- pkgs/tools/networking/checkip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix index a9470217ac89..24605b4ef9a6 100644 --- a/pkgs/tools/networking/checkip/default.nix +++ b/pkgs/tools/networking/checkip/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "checkip"; - version = "0.45.1"; + version = "0.46.1"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GUVyeQtUNnW8yu/dhfip61jxQtgQmjBUDzsOW233laQ="; + sha256 = "sha256-U0jHwKmGHpaHSiOYDeYCXiufw0JjzAmhBnINmFsqOJo="; }; vendorHash = "sha256-9/z1mtZGqrvcvq8cWBpYN7kaPHaPqtyMwMNxuRRP4Cs="; From 6add9f882954b20287d54009b9c61c4ff6cadd79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 May 2023 00:46:04 +0200 Subject: [PATCH 48/51] python310Packages.timm: 0.6.12 -> 0.9.2 Diff: https://github.com/huggingface/pytorch-image-models/compare/refs/tags/v0.6.12...v0.9.2 Changelog: https://github.com/huggingface/pytorch-image-models/blob/v0.9.2/README.md#whats-new --- .../python-modules/timm/default.nix | 33 +++++++++++++++---- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index e93563d69b46..e67ed91c135f 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -7,33 +7,52 @@ , pytest-timeout , huggingface-hub , pyyaml +, safetensors , torch , torchvision }: buildPythonPackage rec { pname = "timm"; - version = "0.6.12"; - disabled = pythonOlder "3.6"; + version = "0.9.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "huggingface"; repo = "pytorch-image-models"; rev = "refs/tags/v${version}"; - hash = "sha256-RNjCcCnNhtr5a+29Bx+k427a03MSooqvnuiDQ8cT8FA="; + hash = "sha256-gYrc8ds6urZvwDsTnzPjxjSTiAGzUD3RlCf0wogCrDI="; }; propagatedBuildInputs = [ huggingface-hub pyyaml + safetensors torch torchvision ]; - nativeCheckInputs = [ expecttest pytestCheckHook pytest-timeout ]; - pytestFlagsArray = [ "tests" ]; - # takes too long and also tries to download models: - disabledTestPaths = [ "tests/test_models.py" ]; + nativeCheckInputs = [ + expecttest + pytestCheckHook + pytest-timeout + ]; + + pytestFlagsArray = [ + "tests" + ]; + + disabledTestPaths = [ + # Takes too long and also tries to download models + "tests/test_models.py" + ]; + + disabledTests = [ + # AttributeError: 'Lookahead' object has no attribute '_optimizer_step_pre... + "test_lookahead" + ]; pythonImportsCheck = [ "timm" From 30faa31dd1b9f26c78c0caf5c70bfcc610bf7c9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 May 2023 22:55:46 +0000 Subject: [PATCH 49/51] tagref: 1.7.0 -> 1.8.1 --- pkgs/tools/misc/tagref/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tagref/default.nix b/pkgs/tools/misc/tagref/default.nix index 72ff71af2eb9..0bd69e362bbb 100644 --- a/pkgs/tools/misc/tagref/default.nix +++ b/pkgs/tools/misc/tagref/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "tagref"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "stepchowfun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ESImTR3CFe6ABCP7JHU7XQYvc2VsDN03lkVaKK9MUEU="; + sha256 = "sha256-fEFMzBLQl93QmaviJXOZkiJ3cqYKNOiz3a+CZL7nyRI="; }; - cargoHash = "sha256-vqRVD5RW0j2bMF/Zl+Ldc06zyDlzRpADWqxtkvKtydE="; + cargoHash = "sha256-dvSP1djkjvdm04lsdxZsxS+0R0PI+jo8blg3zOQcBrU="; meta = with lib; { description = "Tagref helps you refer to other locations in your codebase."; From d8f440adbb171a2c9bd59749fe7962d03d64f448 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 May 2023 01:08:47 +0200 Subject: [PATCH 50/51] checkip: add changelog to meta --- pkgs/tools/networking/checkip/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix index 24605b4ef9a6..d66616cfd7a5 100644 --- a/pkgs/tools/networking/checkip/default.nix +++ b/pkgs/tools/networking/checkip/default.nix @@ -10,18 +10,24 @@ buildGoModule rec { src = fetchFromGitHub { owner = "jreisinger"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-U0jHwKmGHpaHSiOYDeYCXiufw0JjzAmhBnINmFsqOJo="; + rev = "refs/tags/v${version}"; + hash = "sha256-U0jHwKmGHpaHSiOYDeYCXiufw0JjzAmhBnINmFsqOJo="; }; vendorHash = "sha256-9/z1mtZGqrvcvq8cWBpYN7kaPHaPqtyMwMNxuRRP4Cs="; + ldflags = [ + "-w" + "-s" + ]; + # Requires network doCheck = false; meta = with lib; { description = "CLI tool that checks an IP address using various public services"; homepage = "https://github.com/jreisinger/checkip"; + changelog = "https://github.com/jreisinger/checkip/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 473ef198a96044577de0db3ccda3d59e86921327 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 20 May 2023 09:44:08 +1000 Subject: [PATCH 51/51] terraform-providers: use nurl in update-provider script --- .../networking/cluster/terraform-providers/update-provider | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index aaa8a44d60c0..fc71426d85aa 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils curl git jq moreutils nix nix-prefetch +#! nix-shell -i bash -p coreutils curl git jq moreutils nix nurl # shellcheck shell=bash # vim: ft=sh # @@ -90,8 +90,7 @@ update_attr() { repo_root=$(git rev-parse --show-toplevel) generate_hash() { - nix-prefetch -I nixpkgs="${repo_root}" \ - "{ sha256 }: (import ${repo_root} {}).terraform-providers.${provider}.$1.overrideAttrs (_: { inherit sha256; })" + nurl --expr "(import ${repo_root} {}).terraform-providers.${provider}.$1" } echo_provider() {