From d376da366db0d2e2ad39d151ec627a97bb27c0a4 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 3 Jan 2023 14:56:47 -0500 Subject: [PATCH 1/2] nurl: 0.3.1 -> 0.3.3 Diff: https://github.com/nix-community/nurl/compare/v0.3.1...v0.3.3 Changelog: https://github.com/nix-community/nurl/blob/v0.3.3/CHANGELOG.md --- pkgs/tools/misc/nurl/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/nurl/default.nix b/pkgs/tools/misc/nurl/default.nix index 6f0cf9bdfefa..b716e279404e 100644 --- a/pkgs/tools/misc/nurl/default.nix +++ b/pkgs/tools/misc/nurl/default.nix @@ -10,22 +10,25 @@ rustPlatform.buildRustPackage rec { pname = "nurl"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "nix-community"; repo = "nurl"; rev = "v${version}"; - hash = "sha256-fLa9gNdwBOSOMisU1UI8KAKGOkDN13LZsBpH+bObqUM="; + hash = "sha256-bZJlhGbRjhrLk8J0WJq3NCY71MZYsxy8f1ippguOsIM="; }; - cargoSha256 = "sha256-vyhsZYYSpR2qbwTXOw8e1DFRQ78RVHktK6zCbiXT7RI="; + cargoSha256 = "sha256-904IOaovvSOuMyXIxZjaG2iqUoz5qq3hftLGaiA8h0U="; nativeBuildInputs = [ installShellFiles makeWrapper ]; + # tests require internet access + doCheck = false; + postInstall = '' wrapProgram $out/bin/nurl \ --prefix PATH : ${lib.makeBinPath [ gitMinimal mercurial nix ]} From 2d0d7db7f0846cef9627cc79fa446f23c6ebdf16 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 3 Jan 2023 14:52:00 -0500 Subject: [PATCH 2/2] vimPlugins.nvim-treesitter: clean up update script --- .../editors/vim/plugins/nvim-treesitter/generated.nix | 2 +- .../editors/vim/plugins/nvim-treesitter/update.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index c6c995700075..59b5ac48ce9b 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -1,6 +1,6 @@ # generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py -{ buildGrammar, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchgit }: +{ buildGrammar, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchgit, fetchhg, fetchsvn }: { ada = buildGrammar { diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index 6b297cd59157..6963a82d46b6 100755 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -60,10 +60,9 @@ def generate_grammar(item): generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py -{ buildGrammar""" +{ buildGrammar, """ -for fetcher in subprocess.check_output(["nurl", "-L"], text=True).splitlines(): - generated_file += f", {fetcher}" +generated_file += subprocess.check_output(["nurl", "-Ls", ", "], text=True) generated_file += """ }: