forked from fediversity/fediversity
add more comments
This commit is contained in:
parent
551de1fb51
commit
73bc0fd599
2 changed files with 6 additions and 2 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
{
|
{
|
||||||
system ? builtins.currentSystem,
|
system ? builtins.currentSystem,
|
||||||
sources ? import ../npins,
|
sources ? import ../npins,
|
||||||
|
# match the same versions we deploy locally
|
||||||
inputs ? import sources.flake-inputs {
|
inputs ? import sources.flake-inputs {
|
||||||
root = ../.;
|
root = ../.;
|
||||||
},
|
},
|
||||||
|
|
@ -13,11 +14,11 @@ let
|
||||||
inherit (pkgs) lib;
|
inherit (pkgs) lib;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
# shell for testing TF directly
|
||||||
shell = pkgs.mkShellNoCC {
|
shell = pkgs.mkShellNoCC {
|
||||||
packages = [
|
packages = [
|
||||||
pkgs.npins
|
|
||||||
pkgs.jaq # tf
|
|
||||||
(import ./tf.nix { inherit lib pkgs; })
|
(import ./tf.nix { inherit lib pkgs; })
|
||||||
|
pkgs.jaq
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ pkgs.stdenv.mkDerivation {
|
||||||
with lib.fileset;
|
with lib.fileset;
|
||||||
toSource {
|
toSource {
|
||||||
root = ../.;
|
root = ../.;
|
||||||
|
# don't copy ignored files
|
||||||
fileset = intersection (gitTracked ../.) ../.;
|
fileset = intersection (gitTracked ../.) ../.;
|
||||||
};
|
};
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
@ -18,7 +19,9 @@ pkgs.stdenv.mkDerivation {
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
runHook preBuild
|
runHook preBuild
|
||||||
pushd launch/
|
pushd launch/
|
||||||
|
# calculated pins
|
||||||
echo '${lib.strings.toJSON sources}' > .npins.json
|
echo '${lib.strings.toJSON sources}' > .npins.json
|
||||||
|
# generate TF lock for nix's TF providers
|
||||||
tofu init -input=false
|
tofu init -input=false
|
||||||
popd
|
popd
|
||||||
runHook postBuild
|
runHook postBuild
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue