diff --git a/flake.nix b/flake.nix index 2c738c1..d2d1b17 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ outputs = { flake-parts, invokeai-src, hercules-ci-effects, ... }@inputs: flake-parts.lib.mkFlake { inherit inputs; } { perSystem = { system, ... }:{ - _module.args.pkgs = import inputs.nixpkgs { config.allowUnfree = true; inherit system; }; + _module.args.pkgs = import inputs.nixpkgs { config.allowUnfree = true; inherit system; cudaSupport = true; }; legacyPackages = { koboldai = builtins.throw '' diff --git a/projects/automatic1111/default.nix b/projects/automatic1111/default.nix index 8ce53b7..a8696ea 100644 --- a/projects/automatic1111/default.nix +++ b/projects/automatic1111/default.nix @@ -45,8 +45,8 @@ in ../../packages/realesrgan ../../packages/taming-transformers-rom1504 ../../packages/tomesd - ../../packages/torch-fidelity - ../../packages/torch-grammar + #../../packages/torch-fidelity + #../../packages/torch-grammar ../../packages/ultralytics ../../packages/xformers ../../packages/zipunicode @@ -74,8 +74,16 @@ in ]); }; + stable-pkgs = import inputs.nixpkgs-stable { + allowUnfree = true; + cudaSupport = true; + inherit system; + }; + src = inputs.a1111-src; - mkAutomatic1111Variant = args: pkgs.callPackage ./package.nix ({ inherit src; sd-src = inputs.sd-src; sgm-src = inputs.sgm-src; } // args); + mkAutomatic1111Variant = args: pkgs.callPackage ./package.nix ({ + inherit src; sd-src = inputs.sd-src; sgm-src = inputs.sgm-src; inherit stable-pkgs pkgs; + } // args); in { packages = { diff --git a/projects/automatic1111/package.nix b/projects/automatic1111/package.nix index 8b8f224..fa065ce 100644 --- a/projects/automatic1111/package.nix +++ b/projects/automatic1111/package.nix @@ -4,6 +4,8 @@ , # misc lib , src +, stable-pkgs +, pkgs # extra deps }: python3Packages.buildPythonPackage { @@ -36,7 +38,8 @@ python3Packages.buildPythonPackage { taming-transformers-rom1504 timm tomesd - torchWithCuda + #torchWithCuda + #torch-bin transformers xformers @@ -62,7 +65,7 @@ python3Packages.buildPythonPackage { numexpr #deforum deforum #deforum - ]; + ]; patches = [ ./_outputpaths.patch ]; diff --git a/projects/invokeai/package.nix b/projects/invokeai/package.nix index 93e4ec8..3b72309 100644 --- a/projects/invokeai/package.nix +++ b/projects/invokeai/package.nix @@ -76,7 +76,7 @@ python3Packages.buildPythonPackage { huggingface-hub easing-functions dynamicprompts - torchvision + torchvision-bin test-tube ]; nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook pip ]; diff --git a/projects/textgen/package.nix b/projects/textgen/package.nix index face144..8b40e4c 100644 --- a/projects/textgen/package.nix +++ b/projects/textgen/package.nix @@ -76,12 +76,14 @@ let ln -s ${tmpDir}/presets/ $out/presets ''; textgenPython = python3Packages.python.withPackages (_: with python3Packages; [ + aiofiles accelerate bitsandbytes colorama datasets flexgen gradio + gradio-client llama-cpp-python markdown numpy