From 63e7cba1448d94ea969ddb6ae5989e8cfa22f570 Mon Sep 17 00:00:00 2001 From: Denis Manherz Date: Mon, 20 Nov 2023 13:17:43 +0100 Subject: [PATCH] Update --- packages/discord-webhook/default.nix | 7 ++++--- projects/automatic1111/default.nix | 15 --------------- projects/automatic1111/package.nix | 12 +++++++----- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/packages/discord-webhook/default.nix b/packages/discord-webhook/default.nix index 69613f7..7ae634e 100644 --- a/packages/discord-webhook/default.nix +++ b/packages/discord-webhook/default.nix @@ -1,19 +1,20 @@ { lib , buildPythonPackage , fetchPypi +, poetry-core }: buildPythonPackage rec { pname = "discord-webhook"; - version = "1.3.0"; + version = "1.2.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = ""; + sha256 = "sha256-COB3vzKYNwvyMsUvGqrph/J6WbTRLdDaaA85f5N73ZU="; }; - propagatedBuildInputs = [ ]; + propagatedBuildInputs = [ poetry-core ]; doCheck = false; diff --git a/projects/automatic1111/default.nix b/projects/automatic1111/default.nix index 966589b..9413723 100644 --- a/projects/automatic1111/default.nix +++ b/projects/automatic1111/default.nix @@ -78,16 +78,12 @@ in ]; python3Variants = { - amd = l.overlays.applyOverlays pkgs.python3Packages (commonOverlays ++ [ - overlays.python-torchRocm - ]); nvidia = l.overlays.applyOverlays pkgs.python3Packages (commonOverlays ++ [ overlays.python-torchCuda ]); }; src = inputs.a1111-src; - mkAutomatic1111Variant = args: pkgs.callPackage ./package.nix ({ inherit src; sd-src = inputs.sd-src; sgm-src = inputs.sgm-src; } // args); in { packages = { @@ -95,11 +91,6 @@ in python3Packages = python3Variants.nvidia; }; }; - legacyPackages = { - a1111-amd = throw '' - AMD not done yet. - ''; - }; }; flake.nixosModules = let @@ -110,12 +101,6 @@ in }; in { a1111 = ./nixos; - a1111-amd = { - imports = [ - config.flake.nixosModules.invokeai - (packageModule "a1111-amd") - ]; - }; invokeai-nvidia = { imports = [ config.flake.nixosModules.invokeai diff --git a/projects/automatic1111/package.nix b/projects/automatic1111/package.nix index cf50c6d..26edc90 100644 --- a/projects/automatic1111/package.nix +++ b/projects/automatic1111/package.nix @@ -19,10 +19,12 @@ python3Packages.buildPythonPackage { version = "v1.6.0"; inherit src; propagatedBuildInputs = with python3Packages; [ - discord-webhook - numexpr - deforum - ultralytics + imageio #animatediff create webm and shit + av #animatediff create webm and shit + discord-webhook #for dreambooth i think + numexpr #for some extension + deforum #for some extension + ultralytics #extension k_diffusion inflection gdown @@ -31,7 +33,7 @@ python3Packages.buildPythonPackage { openclip semver numpy - rich + rich #extension torchsde uvicorn pyperclip