diff --git a/modules/python.nix b/modules/python.nix index 3972d26..6738909 100644 --- a/modules/python.nix +++ b/modules/python.nix @@ -19,7 +19,7 @@ customPkgs.python-pymatting customPkgs.python-opencv-headless customPkgs.python-rembg - customPkgs.pythonPackages.numpy # should force the monkeypatch'd numpy + customPkgs.pythonPackages.numpy-1 # should force the monkeypatch'd numpy i3ipc pandas matplotlib diff --git a/pkgs/default.nix b/pkgs/default.nix index e89c270..3eac833 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -11,20 +11,6 @@ }; }); - customPydantic = pkgs.python311Packages.override { - overrides = self: super: { - numpy = numpy-1; - pydantic = super.pydantic.overridePythonAttrs (oldAttrs: rec { - version = "1.10.18"; - src = pkgs.fetchPypi { - pname = "pydantic"; - inherit version; - sha256 = "uuvf8ZB9HZahOcJRNqm7fRfhGPEzp2ou87hF6DHjQDo="; - }; - nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ self.setuptools ]; - }); - }; - }; in { fish-rust = pkgs.callPackage ./fish-rust {}; @@ -53,6 +39,5 @@ in { python-ngx-lsp = pkgs.callPackage ./python-nginx-language-server { inherit lib; fetchFromGitHub = pkgs.fetchFromGitHub; - python311Packages = customPydantic; }; } diff --git a/pkgs/python-nginx-language-server/default.nix b/pkgs/python-nginx-language-server/default.nix index 03c2b2f..db1916c 100644 --- a/pkgs/python-nginx-language-server/default.nix +++ b/pkgs/python-nginx-language-server/default.nix @@ -1,10 +1,5 @@ { lib, python311Packages, fetchFromGitHub }: -let - customPydantic = python311Packages.pydantic.overridePythonAttrs (oldAttrs: { - doCheck = false; - }); -in python311Packages.buildPythonPackage rec { pname = "nginx-language-server"; version = "0.8.0"; @@ -23,6 +18,7 @@ python311Packages.buildPythonPackage rec { pygls customPydantic crossplane + pydantic lsprotocol ]; pythonImportsCheck = [ "nginx_language_server" ];