Nix update

lib/pytest-lsp/.gitignore

@@ -1 +1,2 @@
 .coverage
+result

lib/pytest-lsp/flake.nix

@@ -14,27 +14,36 @@
       pytest-lsp-overlay = import ./nix/pytest-lsp-overlay.nix;
     in {
 
-    overlays.default = pytest-lsp-overlay;
-
-    devShells = utils.lib.eachDefaultSystemMap (system:
-      let
-        pkgs = import nixpkgs { inherit system; overlays = [ pytest-lsp-overlay ]; };
-      in
-        eachPythonVersion [ "38" "39" "310" "311" ] (pyVersion:
-          with pkgs; mkShell {
-            name = "py${pyVersion}";
-
-            shellHook = ''
-              export PYTHONPATH="./:$PYTHONPATH"
-            '';
-
-            packages = with pkgs."python${pyVersion}Packages"; [
-              pygls
-              pytest
-              pytest-asyncio
-            ];
-          }
-      )
-    );
-  };
+      overlays.default = pytest-lsp-overlay;
+
+      packages = utils.lib.eachDefaultSystemMap (system:
+        let
+          pkgs = import nixpkgs { inherit system; overlays = [ pytest-lsp-overlay ]; };
+        in
+          eachPythonVersion [ "38" "39" "310" "311"] (pyVersion:
+            pkgs."python${pyVersion}Packages".pytest-lsp
+          )
+      );
+
+      devShells = utils.lib.eachDefaultSystemMap (system:
+        let
+          pkgs = import nixpkgs { inherit system; overlays = [ pytest-lsp-overlay ]; };
+        in
+          eachPythonVersion [ "38" "39" "310" "311" ] (pyVersion:
+            with pkgs; mkShell {
+              name = "py${pyVersion}";
+
+              shellHook = ''
+                export PYTHONPATH="./:$PYTHONPATH"
+              '';
+
+              packages = with pkgs."python${pyVersion}Packages"; [
+                pygls
+                pytest
+                pytest-asyncio
+              ];
+            }
+          )
+      );
+    };
 }

lib/pytest-lsp/nix/pytest-lsp-overlay.nix

@@ -1,71 +1,37 @@
-final: prev: {
+final: prev:
+
+let
+  # Read the package's version from file
+  lines = prev.lib.splitString "\n" (builtins.readFile ../pytest_lsp/client.py);
+  matches = builtins.map (builtins.match ''__version__ = "(.+)"'') lines;
+  versionStr = prev.lib.concatStrings (prev.lib.flatten (builtins.filter builtins.isList matches));
+in {
   pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [(
     python-final: python-prev: {
 
-      # TODO: Remove once https://github.com/NixOS/nixpkgs/pull/233870 is merged
-      typeguard = python-prev.typeguard.overridePythonAttrs (oldAttrs: rec {
-        version = "3.0.2";
-        format = "pyproject";
-
-        src = prev.fetchPypi {
-          inherit version;
-          pname = oldAttrs.pname;
-          sha256 = "sha256-/uUpf9so+Onvy4FCte4hngI3VQnNd+qdJwta+CY1jVo=";
-        };
-
-        propagatedBuildInputs = with python-prev; [
-          importlib-metadata
-          typing-extensions
-        ];
-
-      });
-
-      lsprotocol = python-prev.lsprotocol.overridePythonAttrs(oldAttrs: rec {
-        version = "2023.0.0a3";
-
-        src = prev.fetchFromGitHub {
-          rev = version;
-          owner = "microsoft";
-          repo = oldAttrs.pname;
-          sha256 = "sha256-Q4jvUIMMaDX8mvdmRtYKHB2XbMEchygO2NMmMQdNkTc=";
-        };
-      });
-
-      pygls = python-prev.pygls.overridePythonAttrs (_: {
-        format = "pyproject";
-
-        src = prev.fetchFromGitHub {
-          owner = "openlawlibrary";
-          repo = "pygls";
-          rev = "main";
-          hash = "sha256-JpopfqeLNi23TuZ5mkPEShUPScd1fB0IDXSVGvDYFXE=";
-        };
-
-        nativeBuildInputs = with python-prev; [
-          poetry-core
-        ];
-      });
-
       pytest-lsp = python-prev.buildPythonPackage {
         pname = "pytest-lsp";
-        version = "0.3.0";
+        version = versionStr;
+        format = "pyproject";
 
         src = ./..;
 
+        nativeBuildInputs = with python-final; [
+          hatchling
+        ];
+
         propagatedBuildInputs = with python-final; [
           pygls
           pytest
           pytest-asyncio
         ];
 
         doCheck = true;
-
+        pythonImportsCheck = [ "pytest_lsp" ];
         nativeCheckInputs = with python-prev; [
           pytestCheckHook
         ];
 
-        pythonImportsCheck = [ "pytest_lsp" ];
-
       };
     }
   )];