Merge staging-next into staging

maintainers/maintainer-list.nix

@@ -5074,6 +5074,12 @@
     githubId = 2405974;
     name = "Sébastian Méric de Bellefon";
   };
+  helium = {
+    email = "helium.dev@tuta.io";
+    github = "helium18";
+    githubId = 86223025;
+    name = "helium";
+  };
   henkkalkwater = {
     email = "chris+nixpkgs@netsoj.nl";
     github = "HenkKalkwater";

nixos/modules/hardware/new-lg4ff.nix

@@ -4,6 +4,7 @@ with lib;
 
 let
   cfg = config.hardware.new-lg4ff;
+  kernelPackages = config.boot.kernelPackages;
 in {
   options.hardware.new-lg4ff = {
     enable = mkOption {
@@ -19,7 +20,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     boot = {
-      extraModulePackages = [ pkgs.new-lg4ff ];
+      extraModulePackages = [ kernelPackages.new-lg4ff ];
       kernelModules = [ "hid-logitech-new" ];
     };
   };

pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json

@@ -25,7 +25,6 @@
   "tree-sitter-ruby",
   "tree-sitter-rust",
   "tree-sitter-scala",
-  "tree-sitter-swift",
   "tree-sitter-typescript",
   "tree-sitter-verilog",
   "tree-sitter-zig"

pkgs/applications/misc/liberasurecode/default.nix

@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   pname = "liberasurecode";
-  version = "1.6.2";
+  version = "1.6.3";
 
   outputs = [ "out" "dev" "doc" ];
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner = "openstack";
     repo = pname;
     rev = version;
-    sha256 = "sha256-qV7DL/7zrwrYOaPj6iHnChGA6KHFwYKjeaMnrGrTPrQ=";
+    sha256 = "sha256-HCp+FQ9nq4twk6FtfKhzT80wXXJbvG+clrDO2/9ATpU=";
   };
 
   postPatch = ''

pkgs/applications/science/misc/snakemake/default.nix

@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "snakemake";
-  version = "7.8.0";
+  version = "7.8.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-LEQYcxFwqifA9UajHhPlY32gqrGHDTzbI5G3IH+JdZg=";
+    hash = "sha256-bb6bu4IiW3zaQ3PP/wgRuIwHihC5/6ZS4YSNRk3Tu4s=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

pkgs/applications/virtualization/podman-tui/default.nix

@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , pkg-config
 , fetchFromGitHub
 , buildGoModule
@@ -11,25 +12,21 @@
 }:
 buildGoModule rec {
   pname = "podman-tui";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman-tui";
     rev = "v${version}";
-    sha256 = "sha256-Xc6F87evQiv4jRbxxRBzJBeI8653HvlQL+UwcVWY0wk=";
+    sha256 = "sha256-2WugN5JdTkz3OOt3ggzT7HwMXy1jxn85RwF7409D8m8=";
   };
 
   vendorSha256 = null;
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [
-    btrfs-progs
-    gpgme
-    libassuan
-    lvm2
-  ];
+  buildInputs = [ gpgme libassuan ]
+    ++ lib.optionals stdenv.isLinux [ btrfs-progs lvm2 ];
 
   ldflags = [ "-s" "-w" ];
 
@@ -44,6 +41,5 @@ buildGoModule rec {
     description = "Podman Terminal UI";
     license = licenses.asl20;
     maintainers = with maintainers; [ aaronjheng ];
-    platforms = platforms.linux;
   };
 }

pkgs/development/python-modules/adafruit-platformdetect/default.nix

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "adafruit-platformdetect";
-  version = "3.23.0";
+  version = "3.24.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Adafruit-PlatformDetect";
     inherit version;
-    hash = "sha256-4OWDwvdQBtV+ZqpITr027z0jwfge5/yOof9Xm7QRtuM=";
+    hash = "sha256-XeaRtdw23mNJ+kgSthGRhq4PCGAwTjpjVyNlNRshoQg=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/aiopyarr/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "aiopyarr";
-  version = "22.2.2";
+  version = "22.6.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "tkdrob";
     repo = pname;
     rev = version;
-    hash = "sha256-gkiUPznAJ5nkrdbDKAvODsf6UStsxFugCfkZ0fCJkng=";
+    hash = "sha256-LfZEM1vPccQBrvNz9CGVlihg6YAB7FAvUZogu/ngZ4Y=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-audit-log/default.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-audit-log";
-  version = "0.2.0";
+  version = "0.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d0852f525ad65705f9fbff6288be4493e1449a7906fb5e01bd71c8d1e424d1fc";
+    sha256 = "sha256-bYmQOEiu6YF0d+zjBlRIUbkDpexWHalmu7pajRJQmk0=";
   };
 
   propagatedBuildInputs = [ googleapis-common-protos protobuf ];

pkgs/development/python-modules/google-cloud-core/default.nix

@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-core";
-  version = "2.2.3";
+  version = "2.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-idL3GJvG3HTeEo1CPqUsyHGfCl28zZyoBDP2UEogJVw=";
+    sha256 = "sha256-/apinmF0tBd8LVbrirHd2HZhBk0KPpuwa2Lk1+I0Rmk=";
   };
 
   propagatedBuildInputs = [ google-api-core ];

pkgs/development/python-modules/google-cloud-datacatalog/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-datacatalog";
-  version = "3.7.1";
+  version = "3.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-99hJvY195iUjXOZEOwFQftDkfgtD5V8hSg5ZLWKyWZU=";
+    hash = "sha256-kGYfdvAnvdFm/1u0CS+n6rGKhV5GtGhW1zF7SVUu8PY=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-storage/default.nix

@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-storage";
-  version = "2.2.1";
+  version = "2.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-AkT0YScQy17ERfxndDh1ZOI/mCM2P7QIsock4hAkAbc=";
+    hash = "sha256-9Muw3l4XIo6cCc3Il9geqnDiw5b1hRP3neDoJFhMj1s=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/google-i18n-address/default.nix

@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "google-i18n-address";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "mirumee";
     repo = "google-i18n-address";
     rev = version;
-    sha256 = "0fn5sph6fq68zrjssgvnnvrkavs8arshjwgxng5dr5fsn6qii3mq";
+    sha256 = "sha256-VQEDZkGseZTKOsAMgNYyf6FcgnCjLPpWXijeUmtgyv0=";
   };
 
   propagatedBuildInputs = [ requests ];

pkgs/development/python-modules/hahomematic/default.nix

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "hahomematic";
-  version = "1.7.2";
+  version = "1.7.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "danielperna84";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-lLv3DrBPxw5M903ehKMYqsbBicmXcVS2v7P7FgTNkSQ=";
+    sha256 = "sha256-p1eVlOJQok8Wh9mld6EB2mtAGv97jQ9nf46SqPK8zVs=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/keystoneauth1/default.nix

@@ -24,11 +24,11 @@
 
 buildPythonPackage rec {
   pname = "keystoneauth1";
-  version = "4.5.0";
+  version = "4.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-SbNIiWakPusCAOpRG5l+ZAPCXVY6mExjMOgqDr/EVAw=";
+    sha256 = "sha256-Bm8a3diRFM1qG5yzVVyOqn0BNnPuEDS9/lBgaIBKngU=";
   };
 
   postPatch = ''

pkgs/development/python-modules/msal/default.nix

@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "msal";
-  version = "1.17.0";
+  version = "1.18.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-BOPLe7dcUfVtKQOB8jBWIH3x8+tZTtA9OFUfOxbSo24=";
+    sha256 = "sha256-V2r1WGYDi2DtvLMdgxMlob2CQe0nIYbigylo/UcX0gI=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/oslo-concurrency/default.nix

@@ -18,12 +18,12 @@
 
 buildPythonPackage rec {
   pname = "oslo-concurrency";
-  version = "4.5.0";
+  version = "4.5.1";
 
   src = fetchPypi {
     pname = "oslo.concurrency";
     inherit version;
-    sha256 = "1h76pq9p1bpwcs6jl9m2w4280wcp2w3is88qlaqknqkd3pdaixwr";
+    sha256 = "sha256-aGm5Rrk9lbq/IM0Wvgb8NaXsFNB+osHzFfSsbqXw2hc=";
   };
 
   postPatch = ''

pkgs/development/python-modules/oslo-db/default.nix

@@ -16,12 +16,12 @@
 
 buildPythonPackage rec {
   pname = "oslo-db";
-  version = "11.2.0";
+  version = "11.3.0";
 
   src = fetchPypi {
     pname = "oslo.db";
     inherit version;
-    sha256 = "sha256-ezppPrC1BEkUmiJWGMdQtvDhZWyEJoGEe0e4UK1FYL4=";
+    sha256 = "sha256-CSlZI05V8p+lCgjPcG6LZi4y2nVNrFhjI95TDM/WJnM=";
   };
 
   nativeBuildInputs = [ pbr ];

pkgs/development/python-modules/oslo-log/default.nix

@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "oslo-log";
-  version = "4.7.0";
+  version = "5.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "oslo.log";
     inherit version;
-    hash = "sha256-ycLEyW098LLuuTG0djvbCpBbqvKbiVgW2Vd41p+hJwc=";
+    hash = "sha256-c6tyNKii1QvfUmyHTfocsrEIO6+a2VvC64r1YkidTQE=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/oslo-utils/default.nix

@@ -23,12 +23,12 @@
 
 buildPythonPackage rec {
   pname = "oslo-utils";
-  version = "4.12.2";
+  version = "4.13.0";
 
   src = fetchPypi {
     pname = "oslo.utils";
     inherit version;
-    sha256 = "sha256-Qf0sT/bS6No4qttaW/JCWKhlDg4KaYprI51IuOQXfDs=";
+    sha256 = "sha256-RbqKql7QVqjo5GBZ75PVwte5yZvHSA42HPV4Pkfyj7o=";
   };
 
   postPatch = ''

pkgs/development/python-modules/pyaxmlparser/default.nix

@@ -1,14 +1,14 @@
 { buildPythonPackage, lib, lxml, click, fetchFromGitHub, pytestCheckHook, asn1crypto }:
 
 buildPythonPackage rec {
-  version = "0.3.26";
+  version = "0.3.27";
   pname = "pyaxmlparser";
 
   src = fetchFromGitHub {
     owner = "appknox";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-wD0rN00q4ipKnKubptrgrjNwkBpqsA+ix2xedOOr8Yg=";
+    sha256 = "sha256-NtAsO/I1jDEv676yhAgLguQnB/kHdAqPoLt2QFWbvmw=";
   };
 
   propagatedBuildInputs = [ asn1crypto click lxml ];

pkgs/development/python-modules/pytest-testmon/default.nix

@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "pytest-testmon";
-  version = "1.3.1";
+  version = "1.3.3";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-6gWWCtm/GHknhjLyRdVf42koeaSKzk5/V0173DELmj0=";
+    sha256 = "sha256-Csg5wIm9+ZdAQYdZozlx09rMaVz3GazeS5Z/f4jRECw=";
   };
 
   propagatedBuildInputs = [ pytest coverage ];

pkgs/development/python-modules/python-magic/default.nix

@@ -5,18 +5,18 @@
 , fetchFromGitHub
 , substituteAll
 , file
-, glibcLocales
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "python-magic";
-  version = "0.4.25";
+  version = "0.4.26";
 
   src = fetchFromGitHub {
     owner = "ahupp";
     repo = "python-magic";
     rev = version;
-    sha256 = "sha256-h7YQVH5Z7zunT6AdLPBh3TWpxLpZ5unSHDhkVDFOWDI=";
+    sha256 = "sha256-RcKldMwSRroNZNEl0jwuJG9C+3OIPBzk+CjqkxKK/eY=";
   };
 
   patches = [
@@ -26,12 +26,14 @@ buildPythonPackage rec {
     })
   ];
 
-  checkInputs = [ glibcLocales ];
-
-  checkPhase = ''
-    LC_ALL="en_US.UTF-8" ${python.interpreter} test/test.py
+  preCheck = ''
+    export LC_ALL=en_US.UTF-8
   '';
 
+  checkInputs = [
+    pytestCheckHook
+  ];
+
   meta = with lib; {
     description = "A python interface to the libmagic file type identification library";
     homepage = "https://github.com/ahupp/python-magic";

pkgs/development/python-modules/scmrepo/default.nix

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "scmrepo";
-  version = "0.0.23";
+  version = "0.0.24";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-Yg08twcxXKtDlkOxmD5eafeaeij4zX/3XQQQN948xxs=";
+    hash = "sha256-S1jeLls0do9sCqTWe8h8+8CO3oM160J97UmISUhTU/s=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/statmake/default.nix

@@ -1,12 +1,14 @@
 { lib
-, buildPythonPackage
-, fetchFromGitHub
-, poetry-core
 , attrs
+, buildPythonPackage
 , cattrs
+, fetchFromGitHub
 , fonttools
 , fs
+, importlib-metadata
+, poetry-core
 , pytestCheckHook
+, pythonOlder
 , ufo2ft
 , ufoLib2
 }:
@@ -14,14 +16,15 @@
 buildPythonPackage rec {
   pname = "statmake";
   version = "0.4.1";
-
   format = "pyproject";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchFromGitHub {
     owner = "daltonmaag";
-    repo = "statmake";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "OXhoQAD4LEh80iRUZE2z8sCtWJDv/bSo0bwHbOOPVE0=";
+    sha256 = "sha256-OXhoQAD4LEh80iRUZE2z8sCtWJDv/bSo0bwHbOOPVE0=";
   };
 
   nativeBuildInputs = [
@@ -34,6 +37,8 @@ buildPythonPackage rec {
     fonttools
     # required by fonttools[ufo]
     fs
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    importlib-metadata
   ];
 
   checkInputs = [
@@ -46,9 +51,21 @@ buildPythonPackage rec {
     # https://github.com/daltonmaag/statmake/pull/41
     substituteInPlace pyproject.toml \
       --replace 'requires = ["poetry>=1.0.0"]' 'requires = ["poetry-core"]' \
-      --replace 'build-backend = "poetry.masonry.api"' 'build-backend = "poetry.core.masonry.api"'
+      --replace 'build-backend = "poetry.masonry.api"' 'build-backend = "poetry.core.masonry.api"' \
+      --replace 'cattrs = "^1.1"' 'cattrs = ">= 1.1"'
   '';
 
+  disabledTests = [
+    # cattrs.errors.IterableValidationError: While structuring typing.List[statmake.classes.Axis]
+    # https://github.com/daltonmaag/statmake/issues/42
+    "test_load_stylespace_broken_range"
+    "test_load_stylespace_broken_multilingual_no_en"
+  ];
+
+  pythonImportsCheck = [
+    "statmake"
+  ];
+
   meta = with lib; {
     description = "Applies STAT information from a Stylespace to a variable font";
     homepage = "https://github.com/daltonmaag/statmake";

pkgs/development/python-modules/twilio/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "7.9.1";
+  version = "7.9.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "twilio";
     repo = "twilio-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-oi8LqyeqN8gn06B/m1wNI9iNu7hU3NrdkL7xTsImYPI=";
+    hash = "sha256-JFCYHiPvKYveHYf6SWkmovuvas5+9IGpsnQWqVIaTto=";
   };
 
   propagatedBuildInputs = [

pkgs/development/tools/analysis/tflint/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.36.2";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-DPgYc0nUrRkidWqhv0X9v+2VSNPy1+0ZQ2gCe7T2gu0=";
+    sha256 = "sha256-2fcrKwbYuCOZE++Sin0zNuGaBQQd0dNs1MRL/doOLOw=";
   };
 
-  vendorSha256 = "sha256-Is4dpBu/Nm34NZ3NftSGTZnSR8831kM56dvBjtfUTGU=";
+  vendorSha256 = "sha256-2v070TwDWkN4HZ/EOu85lotA9qIKLgpwD9TrfH7pGY4=";
 
   doCheck = false;
 

pkgs/development/tools/ocaml/ocamlformat/default.nix

@@ -7,55 +7,6 @@ let mkOCamlformat = callPackage ./generic.nix; in
 #  https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433
 
 rec {
-  ocamlformat_0_11_0 = mkOCamlformat {
-    version = "0.11.0";
-  };
-
-  ocamlformat_0_12 = mkOCamlformat {
-    version = "0.12";
-  };
-
-  ocamlformat_0_13_0 = mkOCamlformat rec {
-    version = "0.13.0";
-    tarballName = "ocamlformat-${version}-2.tbz";
-  };
-
-  ocamlformat_0_14_0 = mkOCamlformat {
-    version = "0.14.0";
-  };
-
-  ocamlformat_0_14_1 = mkOCamlformat {
-    version = "0.14.1";
-  };
-
-  ocamlformat_0_14_2 = mkOCamlformat {
-    version = "0.14.2";
-  };
-
-  ocamlformat_0_14_3 = mkOCamlformat {
-    version = "0.14.3";
-  };
-
-  ocamlformat_0_15_0 = mkOCamlformat {
-    version = "0.15.0";
-  };
-
-  ocamlformat_0_15_1 = mkOCamlformat {
-    version = "0.15.1";
-  };
-
-  ocamlformat_0_16_0 = mkOCamlformat {
-    version = "0.16.0";
-  };
-
-  ocamlformat_0_17_0 = mkOCamlformat {
-    version = "0.17.0";
-  };
-
-  ocamlformat_0_18_0 = mkOCamlformat {
-    version = "0.18.0";
-  };
-
   ocamlformat_0_19_0 = mkOCamlformat {
     version = "0.19.0";
   };
@@ -72,5 +23,9 @@ rec {
     version = "0.21.0";
   };
 
-  ocamlformat = ocamlformat_0_21_0;
+  ocamlformat_0_22_4 = mkOCamlformat {
+    version = "0.22.4";
+  };
+
+  ocamlformat = ocamlformat_0_22_4;
 }

pkgs/development/tools/ocaml/ocamlformat/generic.nix

@@ -4,39 +4,18 @@
 }:
 
 let src =
-  if version == "0.11.0"
-  then fetchzip {
-    url = "https://github.com/ocaml-ppx/ocamlformat/archive/0.11.0.tar.gz";
-    sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx";
-  } else fetchurl {
+  fetchurl {
     url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}";
     sha256 = {
-      "0.12" = "1zi8x597dhp2822j6j28s84yyiqppl7kykpwqqclx6ybypvlzdpj";
-      "0.13.0" = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq";
-      "0.14.0" = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi";
-      "0.14.1" = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa";
-      "0.14.2" = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz";
-      "0.14.3" = "13pfakdncddm41cp61p0l98scawbvhx1q4zdsglv7ph87l7zwqfl";
-      "0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6";
-      "0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a";
-      "0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr";
-      "0.17.0" = "0f1lxp697yq61z8gqxjjaqd2ns8fd1vjfggn55x0gh9dx098p138";
-      "0.18.0" = "0571kzmb1h03qj74090n3mg8wfbh29qqrkdjkai6rnl5chll86lq";
       "0.19.0" = "0ihgwl7d489g938m1jvgx8azdgq9f5np5mzqwwya797hx2m4dz32";
       "0.20.0" = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk=";
       "0.20.1" = "sha256-fTpRZFQW+ngoc0T6A69reEUAZ6GmHkeQvxspd5zRAjU=";
       "0.21.0" = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0=";
+      "0.22.4" = "sha256-61TeK4GsfMLmjYGn3ICzkagbc3/Po++Wnqkb2tbJwGA=";
     }."${version}";
   };
-  ocamlPackages =
-  if lib.versionAtLeast version "0.19.0"
-  then ocaml-ng.ocamlPackages
-  else if lib.versionAtLeast version "0.17.0"
-  then ocaml-ng.ocamlPackages_4_12
-  else if lib.versionAtLeast version "0.14.3"
-  then ocaml-ng.ocamlPackages_4_10
-  else ocaml-ng.ocamlPackages_4_07
-; in
+  ocamlPackages = ocaml-ng.ocamlPackages;
+in
 
 with ocamlPackages;
 
@@ -44,10 +23,7 @@ buildDunePackage {
   pname = "ocamlformat";
   inherit src version;
 
-  minimumOCamlVersion =
-    if lib.versionAtLeast version "0.17.0"
-    then "4.08"
-    else "4.06";
+  minimumOCamlVersion = "4.08";
 
   useDune2 = true;
 
@@ -57,120 +33,27 @@ buildDunePackage {
     menhir
   ];
 
-  buildInputs =
-    if lib.versionAtLeast version "0.20.0"
-    then [
-      base
-      (if lib.versionAtLeast version "0.21.0" then cmdliner_1_1 else cmdliner_1_0)
-      dune-build-info
-      either
-      fix
-      fpath
-      menhirLib
-      menhirSdk
-      ocaml-version
-      ocp-indent
-      (if version == "0.20.0" then odoc-parser.override { version = "0.9.0"; } else odoc-parser)
-      re
-      stdio
-      uuseg
-      uutf
-    ]
-    else if lib.versionAtLeast version "0.19.0"
-    then [
-      base
-      cmdliner_1_0
-      fpath
-      re
-      stdio
-      uuseg
-      uutf
-      fix
-      menhirLib
-      menhirSdk
-      ocp-indent
-      dune-build-info
-      (odoc-parser.override { version = "0.9.0"; })
-    ]
-    else if lib.versionAtLeast version "0.18.0"
-    then [
-      base
-      cmdliner_1_0
-      fpath
-      odoc
-      re
-      stdio
-      uuseg
-      uutf
-      fix
-      menhirLib
-      menhirSdk
-      dune-build-info
-      ocaml-version
-      # Changed since 0.16.0:
-      (ppxlib.override { version = "0.22.0"; })
-    ]
-    else if lib.versionAtLeast version "0.17.0"
-    then [
-      base
-      cmdliner_1_0
-      fpath
-      odoc
-      re
-      stdio
-      uuseg
-      uutf
-      fix
-      menhirLib
-      menhirSdk
-      dune-build-info
-      ocaml-version
-      # Changed since 0.16.0:
-      (ppxlib.override { version = "0.22.0"; })
-      ocaml-migrate-parsetree-2
-    ]
-    else if lib.versionAtLeast version "0.15.1"
-    then [
-      base
-      cmdliner_1_0
-      fpath
-      odoc
-      re
-      stdio
-      uuseg
-      uutf
-      fix
-      menhirLib
-      menhirSdk
-      (ppxlib.override { version = "0.18.0"; })
-      dune-build-info # lib.versionAtLeast version "0.16.0"
-      ocaml-version # lib.versionAtLeast version "0.16.0"
-    ]
-    else if lib.versionAtLeast version "0.14"
-    then [
-      base
-      cmdliner_1_0
-      fpath
-      ocaml-migrate-parsetree
-      odoc
-      re
-      stdio
-      uuseg
-      uutf
-      fix
-      menhirLib
-      menhirSdk
-    ] else [
-      base
-      cmdliner_1_0
-      fpath
-      ocaml-migrate-parsetree
-      odoc
-      re
-      stdio
-      uuseg
-      uutf
-    ];
+  buildInputs = [
+    base
+    dune-build-info
+    fix
+    fpath
+    menhirLib
+    menhirSdk
+    ocp-indent
+    re
+    stdio
+    uuseg
+    uutf
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "0.20.0") [ ocaml-version either ]
+  ++ (if lib.versionAtLeast version "0.20.1"
+      then [ odoc-parser ]
+      else [ (odoc-parser.override { version = "0.9.0"; }) ])
+  ++ (if lib.versionAtLeast version "0.21.0"
+      then [ cmdliner_1_1 ]
+      else [ cmdliner_1_0 ])
+  ++ lib.optionals (lib.versionAtLeast version "0.22.4") [ csexp ];
 
   meta = {
     homepage = "https://github.com/ocaml-ppx/ocamlformat";

pkgs/development/tools/parsing/tree-sitter/grammars/default.nix

@@ -78,7 +78,6 @@
   tree-sitter-supercollider = lib.importJSON ./tree-sitter-supercollider.json;
   tree-sitter-surface = lib.importJSON ./tree-sitter-surface.json;
   tree-sitter-svelte = lib.importJSON ./tree-sitter-svelte.json;
-  tree-sitter-swift = lib.importJSON ./tree-sitter-swift.json;
   tree-sitter-tlaplus = lib.importJSON ./tree-sitter-tlaplus.json;
   tree-sitter-toml = lib.importJSON ./tree-sitter-toml.json;
   tree-sitter-tsq = lib.importJSON ./tree-sitter-tsq.json;

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
-  "rev": "fcb2b6f7cb8ab8584d390aa266b0d2df7cbd1fd5",
-  "date": "2022-05-01T16:44:38+01:00",
-  "path": "/nix/store/5kwbva55mi975kqkjrw3jya98cb8i07d-tree-sitter-c-sharp",
-  "sha256": "0xdbh1n1mnglfxn16can69c3sr4ibc37v85vh7ckljcjgqhikfi9",
+  "rev": "9c494a503c8e2044bfffce57f70b480c01a82f03",
+  "date": "2022-05-30T17:23:01+01:00",
+  "path": "/nix/store/h7jans0061yvwj7sph9bzp9ygx7nnqfa-tree-sitter-c-sharp",
+  "sha256": "1pjapli5a70a9308zlb3vfqamh7xybb06vqhljz4xkaagijs91yv",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-c",
-  "rev": "e348e8ec5efd3aac020020e4af53d2ff18f393a9",
-  "date": "2021-09-20T10:21:48-07:00",
-  "path": "/nix/store/bnc2zml2igbpprx4i0h053inv023z6nj-tree-sitter-c",
-  "sha256": "0fmh8b94ra5fi0j9by9yqbc1pf9sh9pjwc3symrslg855w8a0yx7",
+  "rev": "3ced8d6cd212a6f576cd4ef3d533bcb9c09eface",
+  "date": "2022-05-30T15:48:31+02:00",
+  "path": "/nix/store/hh79856h2fw1i3i4g75a78rbzgi8qk3s-tree-sitter-c",
+  "sha256": "0g43xn98i01cgqzv0ck1inj267y7qjwpxzy5l245kdmxgfg4czm8",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-cpp",
-  "rev": "a832195eb3685a279856bb480ce19cff19554b6d",
-  "date": "2022-03-14T15:34:21-05:00",
-  "path": "/nix/store/ixca3nass3hkf0pycf7zhz15h2yq11sk-tree-sitter-cpp",
-  "sha256": "1y0i3w21zg8khns97wy5wpw57bhni4c8faszaz9qb0nrgarbf3i6",
+  "rev": "38d8b495bd43977498f0eb122e0f9cfef8526d18",
+  "date": "2022-05-30T11:35:53-07:00",
+  "path": "/nix/store/4ndwshhwzcj9xrj8g0qnvqz7gwpd64z2-tree-sitter-cpp",
+  "sha256": "0lck8s0z0ay9aw6zljaq892xxmgx8wn3kgsin3sjf5ysyjdva3qn",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/thehamsta/tree-sitter-cuda",
-  "rev": "5178a7a5b25dc7ee4a69bf72f31bd6d3ff0a0795",
-  "date": "2022-03-16T21:48:20+01:00",
-  "path": "/nix/store/gd5s063qfyas370a9rd8mn9wc9d68s15-tree-sitter-cuda",
-  "sha256": "17zqpd27b09izpp9lvkgc1hcnq5nc58i98pak0qi46z85r6zgp6g",
+  "rev": "791d9f9e30958a5f951875342ec8b6f737b39533",
+  "date": "2022-05-14T13:37:18+02:00",
+  "path": "/nix/store/mwrqmqrvysf0dpb2lq6gv7d6798s90gi-tree-sitter-cuda",
+  "sha256": "0zixq97pm4rzhl14m2nb9ynndl2bf1jvkzjs25bh99qcikmdvw0i",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/usernobody14/tree-sitter-dart",
-  "rev": "f95876f0ed3ef207bbd3c5c41987bc2e9cecfc97",
-  "date": "2022-05-07T10:16:06-07:00",
-  "path": "/nix/store/aad6q85ni1rp22jkc0n8mhlhjq7pm794-tree-sitter-dart",
-  "sha256": "0iaa37g5z927dvlxla0nidl9n2hvpsw97b5ffi7w1hq9d4m6rc7i",
+  "rev": "6fc75e0478e89a6adef4903069b0035247378665",
+  "date": "2022-05-21T14:45:10-07:00",
+  "path": "/nix/store/jma7070d07rgksa29ziavrj4ian9p2h3-tree-sitter-dart",
+  "sha256": "1k2877kia3i8df368z6ynig476yr051k60zijahmd7drm740aavb",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/thehamsta/tree-sitter-glsl",
-  "rev": "ffb93961426926554a0ba4a389ea6e9d6fafdea9",
-  "date": "2022-01-24T11:15:06+01:00",
-  "path": "/nix/store/x508b69xq0y2ly4hspkgyq5g0v29xvjz-tree-sitter-glsl",
-  "sha256": "1b91wamhdzqq76l9k3vkmrdb1j98w5slzw8d4piqlgp70j396813",
+  "rev": "a480a02033f8d5c67e798a6f7584ec0d2be568b0",
+  "date": "2022-05-22T00:37:43+02:00",
+  "path": "/nix/store/jw1wnz2wfgibdz9pz0zlxyvs9p3pcayg-tree-sitter-glsl",
+  "sha256": "04yd7s26z4lmjrw325sn68nwma3mj1pl1kj1xvvwzxb9cxb91657",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-go",
-  "rev": "372d3241b099e189406475a9445cbb29dac2e054",
-  "date": "2022-04-28T20:49:46+02:00",
-  "path": "/nix/store/ylm4blh7lw1ac3ym9i69gbbs1cc5vmcs-tree-sitter-go",
-  "sha256": "0cmw37lgpfrw82kg9mcx7kgxnnvdydagbwckqv418zbh2xv881jf",
+  "rev": "aeb2f33b366fd78d5789ff104956ce23508b85db",
+  "date": "2022-05-30T11:35:02-07:00",
+  "path": "/nix/store/iww8iz50gqp58p89f2rk3y9ck5hannaj-tree-sitter-go",
+  "sha256": "1008r5y8h2vpjjcx4cvi9qa02cmfaskc97y2zahjfrv3lm1gkqp7",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/camdencheek/tree-sitter-go-mod",
-  "rev": "e8f51f8e4363a3d9a427e8f63f4c1bbc5ef5d8d0",
-  "date": "2022-04-05T11:00:59-06:00",
-  "path": "/nix/store/4a0idwqi76n4g809inrkv88nv68dgc0i-tree-sitter-go-mod",
-  "sha256": "09rkqwdwhsm41nrz73rqbajap4bc0spjcld9k9fr8xmlmqa67j2b",
+  "rev": "4a65743dbc2bb3094114dd2b43da03c820aa5234",
+  "date": "2022-05-16T16:12:37-04:00",
+  "path": "/nix/store/1aj3kwndjrimfijq0fxx6khn5r6ics3a-tree-sitter-go-mod",
+  "sha256": "1hblbi2bs4hlil703myqhvvq2y1x41rc3w903hg2bhbazh7x8yyf",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-haskell",
-  "rev": "ff5c879d9b75f4e6930d7f687d458f707945ad78",
-  "date": "2022-05-07T17:45:16+02:00",
-  "path": "/nix/store/2pnp7kazxg1sp0anf4by99f27d7z0p64-tree-sitter-haskell",
-  "sha256": "0aa960150wli4hnv64jrl4gqvlgchc3y44bx4d7i53ygn9cdkl12",
+  "rev": "1b54c3f39436bbded6593ac9e0103f9115bbbd2e",
+  "date": "2022-05-19T19:09:09+02:00",
+  "path": "/nix/store/d9825wx3mjjj76pcbbz4pd6fz5h0c2ag-tree-sitter-haskell",
+  "sha256": "11brbizaw5m77hrmg6i5s437y4f1xgvfvjddfy1n39zpyf5x6nad",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-java",
-  "rev": "39a11c8330d0b2ad75310456c378396785f79a4e",
-  "date": "2022-04-28T20:50:54+02:00",
-  "path": "/nix/store/w2hi6yvm3z4cy3bignphb9c2gf6fpnnq-tree-sitter-java",
-  "sha256": "0im81m2wb35n7rgmraf7p5ql6lvr7m9y4krgmkvgqkxnbkw7zcr0",
+  "rev": "ac14b4b1884102839455d32543ab6d53ae089ab7",
+  "date": "2022-05-30T15:48:08+02:00",
+  "path": "/nix/store/plcr9wxxfhsfgwb9xfj3xwns2sh53xsa-tree-sitter-java",
+  "sha256": "1i9zfgqibinz3rkx6yws1wk49iys32x901dki65qihbxcmcfh341",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-javascript",
-  "rev": "fdeb68ac8d2bd5a78b943528bb68ceda3aade2eb",
-  "date": "2021-10-04T13:07:24-04:00",
-  "path": "/nix/store/psmsgqhg4di7mkkd6sgyvcs41jvvq2c3-tree-sitter-javascript",
-  "sha256": "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67",
+  "rev": "785831303ce3d36f5dd8ada7c4c7d63518d4d2f5",
+  "date": "2022-05-30T15:49:16+02:00",
+  "path": "/nix/store/jjxv4pcbnnvsbiplhjk91lxyx5mz8l0z-tree-sitter-javascript",
+  "sha256": "0hk9zy7jykq86x0k10060f2b7xrfai551avfz0qssq3b0j2h1m3g",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-json",
-  "rev": "67d33d619e4fb729432a6d9aff1f7b08bb563728",
-  "date": "2022-05-12T23:07:45-07:00",
-  "path": "/nix/store/k42yw134pyyxwf5zca5ycagsnin7k967-tree-sitter-json",
-  "sha256": "1rbrb87gsy2l27vn0zmncrqpjnsp6k6yd2b0gwhl0l4flqas7qb4",
+  "rev": "368736a6137770f785e1e7479a6be29417eb13aa",
+  "date": "2022-05-22T14:37:14-07:00",
+  "path": "/nix/store/1hgawfjnlijb9vj0bl4ry05p9cnyhpqq-tree-sitter-json",
+  "sha256": "06gvjpg5z8l9vm8a5di5ziv4z1wx3cah1ng14wa9f8r6zi9gn6an",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-julia",
-  "rev": "1e8fe0b3988e7cf56530837fd3a870089ddc7684",
-  "date": "2022-04-15T13:59:51-07:00",
-  "path": "/nix/store/9li8yqbvf95jksbv6myzha9bpmwq6xsg-tree-sitter-julia",
-  "sha256": "0jwwx7ipdw7lq53zn5j72w5n4schjnmfv5fb3lii1nj60fqahrp7",
+  "rev": "fc60b7cce87da7a1b7f8cb0f9371c3dc8b684500",
+  "date": "2022-05-31T14:11:51-07:00",
+  "path": "/nix/store/mmcw5by2scxv3k085qbi0m5qfm7qldmz-tree-sitter-julia",
+  "sha256": "1mkbp0913xi0mccdp4lb3rvcf9h1xljr5mgavs2kmajcabygv46w",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/latex-lsp/tree-sitter-latex",
-  "rev": "3b370b5ca3948312738b4f27b2a12e4bb58907a2",
-  "date": "2022-05-11T20:22:05+02:00",
-  "path": "/nix/store/l1nja32pv92awd5jnksi3wfd29mqxvkd-tree-sitter-latex",
-  "sha256": "0a4ks4ng02qivxr7h1izhc55791czba2r82ngi7a9l0smdxa9yv7",
+  "rev": "104a5dea952d5f00150afd6a8436e6cad95ef718",
+  "date": "2022-06-01T18:13:32+00:00",
+  "path": "/nix/store/7y5r30ylv51rqn3d8wk088ni7k58nzpm-tree-sitter-latex",
+  "sha256": "0b78hpp76hkpjd38zjfc2z98ipnazk2aza83k4r754gj8yshhsqx",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/cstrahan/tree-sitter-nix",
-  "rev": "6d6aaa50793b8265b6a8b6628577a0083d3b923d",
-  "date": "2021-11-29T00:27:21-06:00",
-  "path": "/nix/store/6cjadxvqbrh205lsqnk2rnzq3badxdxv-tree-sitter-nix",
-  "sha256": "0cbk6dqppasrvnm87pwfgm718z6b0xmy9m7zj8ysil0h8bklz1w9",
+  "rev": "6b71a810c0acd49b980c50fc79092561f7cee307",
+  "date": "2022-05-19T13:37:55-05:00",
+  "path": "/nix/store/9x9ffq6k7mxpclpfw8g5ynl30a446mnh-tree-sitter-nix",
+  "sha256": "1v1g49g1jg56nifjp3m3ak6ng3hpzkp51ywaq3rnpwgkij7i4f5r",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/milisims/tree-sitter-org",
-  "rev": "aeacac619457a187bb202b9dfc58541232ed4a25",
-  "date": "2022-05-02T16:54:48-04:00",
-  "path": "/nix/store/y06b3jf6mfgbx4ar9l8crd7r5vljln92-tree-sitter-org",
-  "sha256": "03g52pbnv859wy3sdbr0i440il98idj6zg0q12g7ccxxmwblwxig",
+  "rev": "7ab140276cff85bf6dd08914e04188f4da1ff0ab",
+  "date": "2022-06-01T13:56:57-04:00",
+  "path": "/nix/store/ig79jii0vihy6vjq5j35ymgpbppjcsgd-tree-sitter-org",
+  "sha256": "0j3520h0bvxn6sm8fg1a400y2rnp0l9jrf31n8rbkq9ri34bzi5x",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-php",
-  "rev": "6be89d517d550a47b067b23d0f89a364091b41ca",
-  "date": "2022-05-04T13:05:38-04:00",
-  "path": "/nix/store/pd19zya0sng7dahwgkamk51s1mprg9hf-tree-sitter-php",
-  "sha256": "18yrmvxajcg7m8xqpdkdllm9grs4m9pp4y058ky6q3drq7cx0v1m",
+  "rev": "fdbef3621b62e098d7c9a34669cbe8a8bd807bf2",
+  "date": "2022-06-01T15:02:43+02:00",
+  "path": "/nix/store/rq8rljxmmnii1w2bw3n7224vmwnm0j1n-tree-sitter-php",
+  "sha256": "1bsdls8icmh6wnyhdibmxxignmdx3wh0bkcrwcwc7mc0xac5r4z2",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-python",
-  "rev": "78c4e9b6b2f08e1be23b541ffced47b15e2972ad",
-  "date": "2022-02-07T12:53:14-08:00",
-  "path": "/nix/store/9i5fh21cwa6w2zq9fkcn46207pbk2fzn-tree-sitter-python",
-  "sha256": "09xq6ymwa2ap4432yln5qs0y41iaxbrpp4m07pvydgcmyk3blxvv",
+  "rev": "dafcef7943229ec9d530b36ed67d758e659f4c6c",
+  "date": "2022-05-31T14:13:03-07:00",
+  "path": "/nix/store/9f82z98jx9jlpb96niav0zd173lxmlla-tree-sitter-python",
+  "sha256": "07dkwp46wp8fnh94qy4rlvn8yq0wzawnmbrz7z1jk14ymr6s5hkh",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/r-lib/tree-sitter-r",
-  "rev": "cc04302e1bff76fa02e129f332f44636813b0c3c",
-  "date": "2022-03-28T10:31:51-04:00",
-  "path": "/nix/store/0s6513shwiiqq26ma0alx16f9w0sg2yp-tree-sitter-r",
-  "sha256": "0adq1qng3ghb4wvglplj73q8c95hzpfiqb2q8bqnms81i7p2xma7",
+  "rev": "205c2877af33a814386ff275031f88400a011397",
+  "date": "2022-05-25T11:21:11-04:00",
+  "path": "/nix/store/5sh3nzb04ldqw9kap7la897jfp3m19ai-tree-sitter-r",
+  "sha256": "0xy6w5zybcb4gl38xz1y0s08x7an1ql57i63gmq3awn2hr6w7380",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-rust",
-  "rev": "9a6d980afbb9864405426f1b3905fbcd459871ca",
-  "date": "2022-05-09T16:14:09-07:00",
-  "path": "/nix/store/h5zks31j4xj7vw5ygqhbml0ydsly7l6z-tree-sitter-rust",
-  "sha256": "0hmamkb2hqrp67b756ckifbwdbr0yw7qr2m8farh0bg7rbi5c6z1",
+  "rev": "36ae187ed6dd3803a8a89dbb54f3124c8ee74662",
+  "date": "2022-05-30T15:48:43+02:00",
+  "path": "/nix/store/h3abmx5hwki3lnymgk1awmkrc070733m-tree-sitter-rust",
+  "sha256": "1x1k4cn8x3my2rp735byn0z1sjiw17vkzaqnm10jr8jg5nxigl7a",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/6cdh/tree-sitter-scheme",
-  "rev": "27fb77db05f890c2823b4bd751c6420378df146b",
-  "date": "2022-05-12T23:43:19+08:00",
-  "path": "/nix/store/8h41l86z17msbbdsqrdr45lcys6r9a83-tree-sitter-scheme",
-  "sha256": "15ziav4gas038442yl8f4yz3a2r7grccwyfcyydxw0xpsjnsn5c2",
+  "rev": "1448396b310486e7d15e5e056713457cb0413bc2",
+  "date": "2022-05-17T11:34:51+08:00",
+  "path": "/nix/store/bhwsjp4salwmfq5cyvr0dd3al5s9xhsl-tree-sitter-scheme",
+  "sha256": "1m9pzlzrmphx6162dq2nxry30wpjbsi1zhl4asjvmc0zy4r3427f",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-swift.json

@@ -1,11 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-swift",
-  "rev": "db675450dcc1478ee128c96ecc61c13272431aab",
-  "date": "2022-01-13T10:47:55-08:00",
-  "path": "/nix/store/l3535ndrmi24v5nidxppi1rqccj4s17v-tree-sitter-swift",
-  "sha256": "06mq1an55p75ajwn6pvcy9vlcmzrj8qmbri3mn4bxq53icnj4fya",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}

pkgs/development/tools/parsing/tree-sitter/update.nix

@@ -16,7 +16,6 @@ let
   knownTreeSitterOrgGrammarRepos = [
     "tree-sitter-javascript"
     "tree-sitter-c"
-    "tree-sitter-swift"
     "tree-sitter-json"
     "tree-sitter-cpp"
     "tree-sitter-ruby"
@@ -70,6 +69,8 @@ let
     "tree-sitter-razor"
     # rust library for constructing arbitrary graph structures from source code
     "tree-sitter-graph"
+    # abandoned
+    "tree-sitter-swift"
   ];
   ignoredTreeSitterOrgReposJson = jsonFile "ignored-tree-sitter-org-repos" ignoredTreeSitterOrgRepos;
 

pkgs/development/web/nodejs/v16.nix

@@ -8,8 +8,8 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "16.15.0";
-    sha256 = "sha256-oPgS78Q/eDIeygiVeWCkj15r+XAE1QWMjdOwPGRupPc=";
+    version = "16.15.1";
+    sha256 = "sha256-1OmdPB9pcREJpnUlVxBY5gCc3bwijn1yO4+0pFQWm30=";
     patches = [
       ./disable-darwin-v8-system-instrumentation.patch
     ];

pkgs/development/web/nodejs/v18.nix

@@ -7,8 +7,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "18.2.0";
-  sha256 = "sha256-IwWxXr9VR0dOkFtQAvm6mcfu7wHXOU3+bzhGzGvK1m0=";
+  version = "18.3.0";
+  sha256 = "sha256-P2lKgWJuUFfNpXiY53HSE8/FpkmFX0zxxvbNFQxTBiU=";
   patches = [
     ./disable-darwin-v8-system-instrumentation.patch
   ];

pkgs/servers/mail/mlmmj/default.nix

@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "1sghqvwizvm1a9w56r34qy5njaq1c26bagj85r60h32gh3fx02bn";
   };
 
+  # Workaround build failure on -fno-common toolchains like upstream
+  # gcc-10. Otherwise build fails as:
+  #   ld: getlistdelim.o:/build/mlmmj-1.3.0/src/../include/mlmmj.h:84: multiple definition of
+  #     `subtype_strs'; mlmmj-send.o:/build/mlmmj-1.3.0/src/../include/mlmmj.h:84: first defined here
+  NIX_CFLAGS_COMPILE = "-fcommon";
+
   postInstall = ''
     # grab all documentation files
     docfiles=$(find -maxdepth 1 -name "[[:upper:]][[:upper:]]*")

pkgs/tools/misc/fclones/default.nix

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fclones";
-  version = "0.24.0";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "pkolaczk";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-yiOoknhKGRGUgZShz9gGOsaX1+IOr23UFviIx/Uva6M=";
+    sha256 = "sha256-7MNVLfBH6hWoNy+UQzK6gwZuPbBPMfG660my+E6FT5Q=";
   };
 
-  cargoSha256 = "sha256-CEfFCYUmFv1cG2DEAfgK+wr3UTgFMZlEQVqUaWnqzdk=";
+  cargoSha256 = "sha256-8Ur3KwGuIY8QAGNTcyTpFg2C1CBcIpZJp6EO9g8XuE8=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     AppKit

pkgs/tools/misc/gh-eco/default.nix

@@ -0,0 +1,32 @@
+{ lib
+, fetchFromGitHub
+, buildGoModule
+}:
+
+buildGoModule rec {
+  pname = "gh-eco";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "coloradocolby";
+    repo = "gh-eco";
+    rev = "v${version}";
+    sha256 = "sha256-rJG1k8lOyXQSP3FgyyHZvVrQkn2yEtAcgg9CpbPvCwY=";
+  };
+
+  vendorSha256 = "sha256-Qx/QGIurjKGFcIdCot1MFPatbGHfum48JOoHlvqA64c=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Version=${version}"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/coloradocolby/gh-eco";
+    description = "gh extension to explore the ecosystem";
+    license = licenses.mit;
+    maintainers = with maintainers; [ helium ];
+  };
+}
+

pkgs/tools/security/cfripper/default.nix

@@ -5,13 +5,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "cfripper";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "Skyscanner";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-f/oZ7ZN2WT0a290Cq1w8O4Yggo1YV5k1tiTAm5ulVdI=";
+    hash = "sha256-qrZlCxNLO+q5n/FS/5b51QZVg4ZDwrgWpcKVp/JLTws=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

pkgs/tools/system/netdata/default.nix

@@ -55,6 +55,13 @@ in stdenv.mkDerivation rec {
     ./skip-CONFIGURE_COMMAND.patch
   ];
 
+  # Guard against unused buld-time development inputs in closure. Without
+  # the ./skip-CONFIGURE_COMMAND.patch patch the closure retains inputs up
+  # to bootstrap tools:
+  #   https://github.com/NixOS/nixpkgs/pull/175719
+  # We pick zlib.dev as a simple canary package with pkg-config input.
+  disallowedReferences = [ zlib.dev ];
+
   NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
 
   postInstall = ''

pkgs/top-level/aliases.nix

@@ -1493,6 +1493,19 @@ mapAliases ({
   ocaml_4_02 = throw "'ocamlPackages_4_02.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_02.ocaml'"; # Converted to throw 2022-02-22
   ocaml_4_03 = throw "'ocamlPackages_4_03.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_03.ocaml'"; # Converted to throw 2022-02-22
 
+  ocamlformat_0_11_0 = throw "ocamlformat_0_11_0 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_12 = throw "ocamlformat_0_12 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_13_0 = throw "ocamlformat_0_13_0 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_14_0 = throw "ocamlformat_0_14_0 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_14_1 = throw "ocamlformat_0_14_1 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_14_2 = throw "ocamlformat_0_14_2 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_14_3 = throw "ocamlformat_0_14_3 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_15_0 = throw "ocamlformat_0_15_0 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_15_1 = throw "ocamlformat_0_15_1 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_16_0 = throw "ocamlformat_0_16_0 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_17_0 = throw "ocamlformat_0_17_0 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_18_0 = throw "ocamlformat_0_18_0 has been removed in favor of newer versions"; # Added 2022-06-01
+
   zabbix44 = throw ''
     Zabbix 4.4 is end of life. For details on upgrading to Zabbix 5.0 look at
     https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500

pkgs/top-level/all-packages.nix

@@ -1136,6 +1136,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  gh-eco = callPackage ../tools/misc/gh-eco { };
+
   glooctl = callPackage ../applications/networking/cluster/glooctl { };
 
   gobgp = callPackage ../tools/networking/gobgp { };
@@ -13600,10 +13602,8 @@ with pkgs;
 
   inherit (callPackage ../development/tools/ocaml/ocamlformat { })
     ocamlformat # latest version
-    ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0
-    ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0
-    ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0 ocamlformat_0_18_0
-    ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0;
+    ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0
+    ocamlformat_0_22_4;
 
   orc = callPackage ../development/compilers/orc { };
 
@@ -23097,10 +23097,6 @@ with pkgs;
     stdenv = gcc11Stdenv;
   };
 
-  new-lg4ff = callPackage ../os-specific/linux/new-lg4ff {
-    inherit (linuxPackages) kernel;
-  };
-
   nmon = callPackage ../os-specific/linux/nmon { };
 
   hwdata = callPackage ../os-specific/linux/hwdata { };

pkgs/top-level/linux-kernels.nix

@@ -343,6 +343,8 @@ in {
 
     mbp2018-bridge-drv = callPackage ../os-specific/linux/mbp-modules/mbp2018-bridge-drv { };
 
+    new-lg4ff = callPackage ../os-specific/linux/new-lg4ff { };
+
     nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
 
     nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { }));