Merge pull request 'pinned-clan-core' (#3574) from pinned-clan-core into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3574
This commit is contained in:
@@ -147,25 +147,7 @@
|
|||||||
perSystem =
|
perSystem =
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let
|
let
|
||||||
clanCore = self.filter {
|
clanCore = self.checks.x86_64-linux.clan-core-for-checks;
|
||||||
include = [
|
|
||||||
"checks/backups"
|
|
||||||
"checks/flake-module.nix"
|
|
||||||
"clanModules/borgbackup"
|
|
||||||
"clanModules/flake-module.nix"
|
|
||||||
"clanModules/localbackup"
|
|
||||||
"clanModules/packages"
|
|
||||||
"clanModules/single-disk"
|
|
||||||
"clanModules/zerotier"
|
|
||||||
"flake.lock"
|
|
||||||
"flakeModules"
|
|
||||||
"inventory.json"
|
|
||||||
"nixosModules"
|
|
||||||
# Just include everything in 'lib'
|
|
||||||
# If anything changes in /lib that may affect everything
|
|
||||||
"lib"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
checks = pkgs.lib.mkIf pkgs.stdenv.isLinux {
|
checks = pkgs.lib.mkIf pkgs.stdenv.isLinux {
|
||||||
@@ -182,11 +164,6 @@
|
|||||||
# import the inventory generated nixosModules
|
# import the inventory generated nixosModules
|
||||||
self.clanInternals.inventoryClass.machines.test-backup.machineImports;
|
self.clanInternals.inventoryClass.machines.test-backup.machineImports;
|
||||||
clan.core.settings.directory = ./.;
|
clan.core.settings.directory = ./.;
|
||||||
environment.systemPackages = [
|
|
||||||
(pkgs.writeShellScriptBin "foo" ''
|
|
||||||
echo ${clanCore}
|
|
||||||
'')
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = ''
|
testScript = ''
|
||||||
|
|||||||
@@ -32,7 +32,6 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let
|
let
|
||||||
dependencies = [
|
dependencies = [
|
||||||
self
|
|
||||||
pkgs.stdenv.drvPath
|
pkgs.stdenv.drvPath
|
||||||
pkgs.stdenvNoCC
|
pkgs.stdenvNoCC
|
||||||
self.nixosConfigurations.test-morph-machine.config.system.build.toplevel
|
self.nixosConfigurations.test-morph-machine.config.system.build.toplevel
|
||||||
|
|||||||
Reference in New Issue
Block a user