update gradio to 3.5

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "InvokeAI"]
 	path = InvokeAI
-	url = https://github.com/invoke-ai/InvokeAI
+	url = ../../invoke-ai/InvokeAI
 	branch = main
 [submodule "stable-diffusion-webui"]
 	path = stable-diffusion-webui
-	url = git@github.com:AUTOMATIC1111/stable-diffusion-webui.git
+	url = ../../AUTOMATIC1111/stable-diffusion-webui

flake.lock

@@ -34,7 +34,25 @@
     "root": {
       "inputs": {
         "nixlib": "nixlib",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "stable-diffusion-repo": "stable-diffusion-repo"
+      }
+    },
+    "stable-diffusion-repo": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1661187475,
+        "narHash": "sha256-3YkSUATD/73nJFm4os3ZyNU8koabGB/6iR0XbTUQmVY=",
+        "owner": "CompVis",
+        "repo": "stable-diffusion",
+        "rev": "69ae4b35e0a0f6ee1af8bb9a5d0016ccb27e36dc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "CompVis",
+        "repo": "stable-diffusion",
+        "rev": "69ae4b35e0a0f6ee1af8bb9a5d0016ccb27e36dc",
+        "type": "github"
       }
     }
   },

flake.nix

@@ -6,8 +6,12 @@
     nixpkgs = {
       url = "github:NixOS/nixpkgs?rev=fd54651f5ffb4a36e8463e0c327a78442b26cbe7";
     };
+    stable-diffusion-repo = {
+      url = "github:CompVis/stable-diffusion?rev=69ae4b35e0a0f6ee1af8bb9a5d0016ccb27e36dc";
+      flake = false;
+    };
   };
-  outputs = { self, nixpkgs, nixlib }@inputs:
+  outputs = { self, nixpkgs, nixlib, stable-diffusion-repo }@inputs:
     let
       nixlib = inputs.nixlib.outputs.lib;
       supportedSystems = [ "x86_64-linux" ];
@@ -114,6 +118,7 @@
           analytics-python = callPackage ./packages/analytics-python { };
           markdown-it-py = callPackage ./packages/markdown-it-py { };
           gradio = callPackage ./packages/gradio { };
+          hatch-requirements-txt = callPackage ./packages/hatch-requirements-txt { };
           torch-fidelity = callPackage ./packages/torch-fidelity { };
           resize-right = callPackage ./packages/resize-right { };
           torchdiffeq = callPackage ./packages/torchdiffeq { };

packages/gradio/default.nix

@@ -36,22 +36,31 @@
 , scikitimage
 , shap
 , ipython
+, hatchling
+, hatch-requirements-txt
+, hatch-fancy-pypi-readme
 , pytestCheckHook
 , websockets
 }:
 
 buildPythonPackage rec {
   pname = "gradio";
-  version = "3.3";
+  version = "3.5";
   disabled = pythonOlder "3.7";
+  format = "pyproject";
 
   # We use the Pypi release, as it provides prebuild webui assets,
   # and its releases are also more frequent than github tags
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-mJojLaqTM5C6ZI+FTe/1J6yV8+GccgpwlgIMUQtJsC8=";
+    sha256 = "sha256-8MmpH2N1twrPGHS+HBLDWRtpg2Gd1rQzulbOEDr3rNQ=";
   };
 
+  nativeBuildInputs = [
+    hatchling
+    hatch-requirements-txt
+    hatch-fancy-pypi-readme
+  ];
   propagatedBuildInputs = [
     analytics-python
     aiohttp

packages/hatch-requirements-txt/default.nix

@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, hatchling
+, packaging
+}:
+
+buildPythonPackage rec {
+  pname = "hatch-requirements-txt";
+  version = "0.2.0";
+  disabled = pythonOlder "3.6.1";
+  format = "pyproject";
+
+  # We use the Pypi release, as it provides prebuild webui assets,
+  # and its releases are also more frequent than github tags
+  src = fetchPypi {
+    pname = "hatch_requirements_txt";
+    inherit version;
+    sha256 = "sha256-I8z34vvPK7Mg9+Xg2nMgNcgeh5QFB0LV2j0iwzA1QGc=";
+  };
+
+  nativeBuildInputs = [
+  ];
+  propagatedBuildInputs = [
+    hatchling
+    packaging
+  ];
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = "https://github.com/repo-helper/hatch-requirements-txt";
+    description = "Hatchling plugin to read project dependencies from requirements.txt";
+  };
+}