kiara/Fediversity
1
0
Fork 0
forked from fediversity/fediversity
Code Pull requests Activity

factor out tf-env.nix (#539)

Browse source 
Reviewed-on: fediversity/fediversity#539
This commit is contained in:
Kiara Grouwstra 2025-10-06 16:58:59 +02:00
parent 2a7135fd64
commit 82d6059158
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
deployment/data-model.nix
View file

@ -265,7 +265,11 @@ let
deployment-type = "tf-host"; deployment-type = "tf-host";
}; };
}; };
tf-env = pkgs.callPackage ./run/tf-single-host/tf-env.nix { inherit httpBackend; }; tf-env = pkgs.callPackage ./run/tf-env.nix {
inherit httpBackend;
tfPackage = pkgs.callPackage ./run/tf-single-host/tf.nix { };
tfDirs = [ "deployment/run/tf-single-host" ];
};
in in
pkgs.writers.writeBashBin "deploy-tf.sh" pkgs.writers.writeBashBin "deploy-tf.sh"
(withPackages [ (withPackages [

20
deployment/run/tf-single-host/tf-env.nix → deployment/run/tf-env.nix
View file

@ -2,26 +2,30 @@
lib, lib,
pkgs, pkgs,
httpBackend, httpBackend,
sources ? import ../../../npins, tfPackage,
tfDirs,
sources ? import ../../npins,
}: }:
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
name = "tf-repo"; name = "tf-repo";
src = src =
with lib.fileset; with lib.fileset;
toSource { toSource {
root = ../../../.; root = ../../.;
# don't copy ignored files # don't copy ignored files
fileset = gitTracked ../../../.; fileset = gitTracked ../../.;
}; };
buildInputs = [ buildInputs = [
(pkgs.callPackage ./tf.nix { inherit sources; }) tfPackage
(pkgs.callPackage ../tf-setup.nix { inherit sources httpBackend; }) (pkgs.callPackage ./tf-setup.nix { inherit sources httpBackend; })
]; ];
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
pushd deployment/run/tf-single-host for category in ${builtins.toString tfDirs}; do
source setup pushd "$category"
popd source setup
popd
done
runHook postBuild runHook postBuild
''; '';
installPhase = '' installPhase = ''