diff --git a/.devops/nix/devshells.nix b/.devops/nix/devshells.nix index f8d541f30..afaaa2644 100644 --- a/.devops/nix/devshells.nix +++ b/.devops/nix/devshells.nix @@ -2,9 +2,7 @@ concatMapAttrs (name: package: { - ${name} = package.passthru.shell.overrideAttrs (prevAttrs: { inputsFrom = [ package ]; }); - ${name + "-extra"} = package.passthru.shell-extra.overrideAttrs ( - prevAttrs: { inputsFrom = [ package ]; } - ); + ${name} = package.passthru.shell; + ${name + "-extra"} = package.passthru.shell-extra; }) packages diff --git a/.devops/nix/package.nix b/.devops/nix/package.nix index 42349d0ba..ccce3e5e6 100644 --- a/.devops/nix/package.nix +++ b/.devops/nix/package.nix @@ -91,7 +91,7 @@ let ]; in -effectiveStdenv.mkDerivation { +effectiveStdenv.mkDerivation (finalAttrs: { name = "llama.cpp"; src = ../../.; meta = { @@ -178,12 +178,14 @@ effectiveStdenv.mkDerivation { name = "default${descriptionSuffix}"; description = "contains numpy and sentencepiece"; buildInputs = [ llama-python ]; + inputsFrom = [ finalAttrs.finalPackage ]; }; shell-extra = mkShell { name = "extra${descriptionSuffix}"; description = "contains numpy, sentencepiece, torchWithoutCuda, and transformers"; buildInputs = [ llama-python-extra ]; + inputsFrom = [ finalAttrs.finalPackage ]; }; }; -} +})