diff --git a/flake.lock b/flake.lock index b9d384b..042ccd9 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683717387, - "narHash": "sha256-b4GSeKtDH+7wzw9VptHqIWOyIq28j7++rvRqhCEWFQ8=", + "lastModified": 1703134684, + "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1e8ab5db89c84b1bb29d8d10ea60766bb5cee1f2", + "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8aef94b..9db1d54 100644 --- a/flake.nix +++ b/flake.nix @@ -30,23 +30,24 @@ withRuby = false; withPython3 = false; }; - dependancies = with pkgs; [ + dependencies = with pkgs; [ ripgrep ]; - full-dependancies = with pkgs; [ + full-dependencies = with pkgs; [ gopls - ] ++ dependancies; + ] ++ dependencies; neovim-with-deps = recursiveMerge [ pkgs.neovim-unwrapped - { buildInputs = dependancies; } + { buildInputs = dependencies; } ]; neovim-with-full-deps = recursiveMerge [ pkgs.neovim-unwrapped - { buildInputs = full-dependancies; } + { buildInputs = full-dependencies; } ]; in rec { packages.full = pkgs.wrapNeovim neovim-with-full-deps (base // { - extraMakeWrapperArgs = ''--prefix PATH : "${pkgs.lib.makeBinPath full-dependancies}"''; + withPython3 = true; + extraMakeWrapperArgs = ''--prefix PATH : "${pkgs.lib.makeBinPath full-dependencies}"''; configure = { customRC = '' @@ -64,7 +65,7 @@ }; }); packages.minimal = pkgs.wrapNeovim neovim-with-deps (base // { - extraMakeWrapperArgs = ''--prefix PATH : "${pkgs.lib.makeBinPath dependancies}"''; + extraMakeWrapperArgs = ''--prefix PATH : "${pkgs.lib.makeBinPath dependencies}"''; configure = { customRC = ''