From 37ab4c8cf52f1fb762493cae7fca3885f6d19e2d Mon Sep 17 00:00:00 2001 From: Will Ruggiano Date: Wed, 2 Oct 2024 00:27:54 -0700 Subject: [PATCH] fix: pin neovim prior to treesitter bump --- flake.lock | 24 ++++++++++++++---------- flake.nix | 5 +++++ nix/sources.json | 2 +- pkgs/nvim-treesitter/grammars/java.json | 8 ++++---- pkgs/nvim-treesitter/grammars/nix.json | 8 ++++---- 5 files changed, 28 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 1890e9d..83211ce 100644 --- a/flake.lock +++ b/flake.lock @@ -395,11 +395,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -746,17 +746,19 @@ "flake-parts": "flake-parts_3", "git-hooks": [], "hercules-ci-effects": [], - "neovim-src": "neovim-src", + "neovim-src": [ + "neovim-src" + ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1727674961, - "narHash": "sha256-IkD7D2+zKyRXlNQ8sg+4dZZAfjkSNVSrWiVpVzY4jZw=", + "lastModified": 1727852635, + "narHash": "sha256-eY0Y5ZDMo5IS+K42kMwAMCLsYHoAgPW3R4UxeGfzP0U=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "23cdd6c58fe389f6c3da06b157b512fedd9d5f5a", + "rev": "377cf41246ee443c86c4ae48f66f5100038fe158", "type": "github" }, "original": { @@ -791,16 +793,17 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1727649824, - "narHash": "sha256-P7a5cu/kHSp0kI2DR048BaEblSvDAlmLsNr9SPa1zI4=", + "lastModified": 1727843252, + "narHash": "sha256-gOVPWg3lHbuGzDH0p0SOBjiZgrl6DwV7xcuxVU+7OtE=", "owner": "neovim", "repo": "neovim", - "rev": "20251be15a4ad3f6e7016450ca3338d52b2f0951", + "rev": "3d1e6c56f08f420c0d91ffbee888c05b20806a5e", "type": "github" }, "original": { "owner": "neovim", "repo": "neovim", + "rev": "3d1e6c56f08f420c0d91ffbee888c05b20806a5e", "type": "github" } }, @@ -1494,6 +1497,7 @@ "naersk": "naersk", "neovim": "neovim", "neovim-nix": "neovim-nix", + "neovim-src": "neovim-src", "nil": "nil", "nix-colors": "nix-colors", "nixpkgs": "nixpkgs_7", diff --git a/flake.nix b/flake.nix index aa2b8e7..d2c6236 100644 --- a/flake.nix +++ b/flake.nix @@ -21,8 +21,13 @@ git-hooks.follows = ""; hercules-ci-effects.follows = ""; nixpkgs.follows = "nixpkgs"; + neovim-src.follows = "neovim-src"; }; }; + neovim-src = { + url = "github:neovim/neovim/3d1e6c56f08f420c0d91ffbee888c05b20806a5e"; + flake = false; + }; nil.url = "github:oxalica/nil"; nix-colors.url = "github:misterio77/nix-colors"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; diff --git a/nix/sources.json b/nix/sources.json index 4c9d6d0..846bef7 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -278,7 +278,7 @@ "nvim-treesitter": { "branch": "master", "repo": "ssh://git@github.com/nvim-treesitter/nvim-treesitter", - "rev": "d1e1f17cea23f14cbe230635b9bb654a835f02d7", + "rev": "3af8476530caa0906aa68f4dc911f76e77b478a9", "type": "git" }, "nvim-treesitter-textobjects": { diff --git a/pkgs/nvim-treesitter/grammars/java.json b/pkgs/nvim-treesitter/grammars/java.json index 78727d6..90c66a9 100644 --- a/pkgs/nvim-treesitter/grammars/java.json +++ b/pkgs/nvim-treesitter/grammars/java.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-java", - "rev": "245b05c6ba900fa708242835f6168ef76f9d951e", - "date": "2024-09-01T06:35:15-04:00", - "sha256": "1qxiddgk3nqy6xdvbciygryfq9bap8529hl2dpx7ma9888qfxkhb", - "hash": "sha256-C87uMEIoqXr6bYLCJAq6aiXsfH4+srVbNx7bMV9rseM=", + "rev": "490d878cf33b0ad5ae7a7253ff30597a5bdc348e", + "date": "2024-09-30T15:12:36-04:00", + "sha256": "1m4806bq6ga90vf00dbjkjvz64k06raw2w984yhnpgghbrvgm5xj", + "hash": "sha256-spf6dl7wvWuhJyhxwVU2YBLzt5xyNQDcBkk9g5cBiNQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/nvim-treesitter/grammars/nix.json b/pkgs/nvim-treesitter/grammars/nix.json index b5386a1..a3a307a 100644 --- a/pkgs/nvim-treesitter/grammars/nix.json +++ b/pkgs/nvim-treesitter/grammars/nix.json @@ -1,9 +1,9 @@ { "url": "https://github.com/cstrahan/tree-sitter-nix", - "rev": "fcf1857e254ab654e0fb73fe9706e33c52e79a5c", - "date": "2024-09-27T12:33:25Z", - "sha256": "1xh9dwqxwrfa9i0asszyzsdrs42gj806v53kndpgh1hwx9r94a3b", - "hash": "sha256-ayiScuocBvhus3OUbQCSTxCdm/7+a61ATMpl3jFvCfY=", + "rev": "49adb0f7656fe1737bb11aff593692157905d1b1", + "date": "2024-10-01T20:16:08Z", + "sha256": "138gwnqbrmshklpli4virblhxfx1lv9bzskgg8lbd1hkkk99za1w", + "hash": "sha256-PKif0pwThrYoem/qv9KmobsO6cpxk0gvnVDXvLDlD40=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false,