From b645aebf776dfc0565079aea743a15aac155e34c Mon Sep 17 00:00:00 2001 From: Will Ruggiano Date: Fri, 15 Dec 2023 11:28:38 -0700 Subject: [PATCH] fix: python lsp not finding script deps --- flake.nix | 15 +++++++++------ scripts/update-sources/default.nix | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index a11d779..1138f46 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,7 @@ }; devShells.${system}.default = pkgs.mkShell { - buildInputs = with pkgs; [niv ruff-lsp]; + buildInputs = with pkgs; [niv pkgs.python3.pkgs.semver ruff-lsp]; }; packages.${system} = let @@ -38,14 +38,17 @@ packageSets.nixpkgs = pkgs; modules = [ { - config.deps.src = src; - config.deps.version = version; + config.deps = { + inherit src version; + }; } ./default.nix { - paths.projectRoot = ./.; - paths.projectRootFile = "flake.nix"; - paths.package = ./.; + paths = { + projectRoot = ./.; + projectRootFile = "flake.nix"; + package = ./.; + }; } ]; }; diff --git a/scripts/update-sources/default.nix b/scripts/update-sources/default.nix index 825f589..dbbd100 100644 --- a/scripts/update-sources/default.nix +++ b/scripts/update-sources/default.nix @@ -9,7 +9,7 @@ writeShellApplication { runtimeInputs = [ gh niv - (python3.withPackages (ps: with ps; [semver])) + (python3.withPackages (pkgs: with pkgs; [semver])) ]; text = '' gh api repos/microsoft/vscode-js-debug/releases --jq '.[].tag_name' | python ${./update-sources.py}