danvics/selfhostblocks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

mod: use more callPackage now that is passes shb lib too

Browse source
This commit is contained in:
ibizaman 2025-10-15 01:32:31 +02:00 committed by Pierre Penninckx
parent 6e64c7f8cf
commit 2cc2ab5195
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/blocks/hardcodedsecret.nix
View file

@ -2,7 +2,7 @@
let let
cfg = config.shb.hardcodedsecret; cfg = config.shb.hardcodedsecret;
contracts = pkgs.callPackage ../contracts { inherit lib; }; contracts = pkgs.callPackage ../contracts {};
inherit (lib) mapAttrs' mkOption nameValuePair; inherit (lib) mapAttrs' mkOption nameValuePair;
inherit (lib.types) attrsOf nullOr str submodule; inherit (lib.types) attrsOf nullOr str submodule;

10
modules/contracts/default.nix
View file

@ -47,12 +47,12 @@ in
{ {
databasebackup = importContract ./databasebackup.nix; databasebackup = importContract ./databasebackup.nix;
backup = importContract ./backup.nix; backup = importContract ./backup.nix;
mount = import ./mount.nix { inherit lib; }; mount = pkgs.callPackage ./mount.nix {};
secret = importContract ./secret.nix; secret = importContract ./secret.nix;
ssl = import ./ssl.nix { inherit lib; }; ssl = pkgs.callPackage ./ssl.nix {};
test = { test = {
secret = import ./secret/test.nix { inherit pkgs lib; }; secret = pkgs.callPackage ./secret/test.nix {};
databasebackup = import ./databasebackup/test.nix { inherit pkgs lib; }; databasebackup = pkgs.callPackage ./databasebackup/test.nix {};
backup = import ./backup/test.nix { inherit pkgs lib; }; backup = pkgs.callPackage ./backup/test.nix {};
}; };
} }

4
test/contracts/backup.nix
View file

@ -1,6 +1,6 @@
{ pkgs, lib, ... }: { pkgs, ... }:
let let
contracts = pkgs.callPackage ../../modules/contracts { inherit lib; }; contracts = pkgs.callPackage ../../modules/contracts {};
in in
{ {
restic_root = contracts.test.backup { restic_root = contracts.test.backup {

4
test/contracts/databasebackup.nix
View file

@ -1,6 +1,6 @@
{ pkgs, lib, ... }: { pkgs, ... }:
let let
contracts = pkgs.callPackage ../../modules/contracts { inherit lib; }; contracts = pkgs.callPackage ../../modules/contracts {};
in in
{ {
restic_postgres = contracts.test.databasebackup { restic_postgres = contracts.test.databasebackup {

4
test/contracts/secret.nix
View file

@ -1,6 +1,6 @@
{ pkgs, lib, ... }: { pkgs, ... }:
let let
contracts = pkgs.callPackage ../../modules/contracts { inherit lib; }; contracts = pkgs.callPackage ../../modules/contracts {};
in in
{ {
hardcoded_root_root = contracts.test.secret { hardcoded_root_root = contracts.test.secret {