installed new deps for 2.1, updated submodule

InvokeAI

@@ -1 +1 @@
-Subproject commit 90d37eac034592cc3aed5a15a98971801b21988e
+Subproject commit 93cdb476d919b779e32a638aae15e56cc46b7adb

flake.nix

@@ -44,7 +44,7 @@
         # following packages not needed for vanilla SD but used by both UIs
         realesrgan
         pillow
-      ] 
+      ]
       ++ nixlib.optional (!webui) [
         send2trash
         flask
@@ -53,6 +53,8 @@
         dependency-injector
         gfpgan
         eventlet
+        clipseg
+        getpass-asterisk
       ]
       ++ nixlib.optional webui [
         addict
@@ -109,7 +111,7 @@
         let
           rm = d: d.overrideAttrs (old: {
             nativeBuildInputs = old.nativeBuildInputs ++ [ self.pythonRelaxDepsHook ];
-            pythonRemoveDeps = [ "opencv-python-headless" "opencv-python" "tb-nightly" ];
+            pythonRemoveDeps = [ "opencv-python-headless" "opencv-python" "tb-nightly" "clip" ];
           });
           callPackage = self.callPackage;
           rmCallPackage = path: args: rm (callPackage path args);
@@ -127,6 +129,7 @@
           facexlib = rmCallPackage ./packages/facexlib { opencv-python = self.opencv4; };
           realesrgan = rmCallPackage ./packages/realesrgan { opencv-python = self.opencv4; };
           codeformer = callPackage ./packages/codeformer { opencv-python = self.opencv4; };
+          clipseg = rmCallPackage ./packages/clipseg { opencv-python = self.opencv4; };
           filterpy = callPackage ./packages/filterpy { };
           kornia = callPackage ./packages/kornia { };
           lpips = callPackage ./packages/lpips { };
@@ -149,6 +152,7 @@
           clip-anytorch = callPackage ./packages/clip-anytorch { };
           jsonmerge = callPackage ./packages/jsonmerge { };
           clean-fid = callPackage ./packages/clean-fid { };
+          getpass-asterisk = callPackage ./packages/getpass-asterisk { };
         };
       overlay_amd = nixpkgs: pythonPackages:
         rec {

packages/clipseg/default.nix

@@ -0,0 +1,30 @@
+# WARNING: This file was automatically generated. You should avoid editing it.
+# If you run pynixify again, the file will be either overwritten or
+# deleted, and you will lose the changes you made to it.
+
+{ buildPythonPackage, clip-anytorch, fetchFromGitHub, lib, matplotlib, numpy, opencv-python
+, scipy, torch, torchvision }:
+
+buildPythonPackage rec {
+  pname = "clipseg";
+  version = "0.0.1";
+
+  src = fetchFromGitHub {
+    owner = "invoke-ai";
+    repo = "clipseg";
+    rev = "master";
+    sha256 = "sha256-S5RAeodqG7X6E5hnFhorR3LmfapKD9r50PqXGuc5sXE=";
+    };
+
+  propagatedBuildInputs =
+    [ numpy scipy matplotlib torch torchvision opencv-python clip-anytorch ];
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = ''
+      This repository contains the code used in the paper "Image Segmentation Using Text and Image Prompts".'';
+    homepage = "https://github.com/timojl/clipseg";
+  };
+}

packages/getpass-asterisk/default.nix

@@ -0,0 +1,25 @@
+# WARNING: This file was automatically generated. You should avoid editing it.
+# If you run pynixify again, the file will be either overwritten or
+# deleted, and you will lose the changes you made to it.
+
+{ buildPythonPackage, fetchPypi, lib }:
+
+buildPythonPackage rec {
+  pname = "getpass-asterisk";
+  version = "1.0.1";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "getpass_asterisk";
+    sha256 = "1sd99sss404hzp1zsks69q4ck186wgjv8g5p2m7glqng4jlmghvw";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description =
+      "An alternative implementation for getpass that echoes masked password (such as asterisks)";
+    homepage = "https://github.com/secursive/getpass_asterisk";
+  };
+}