Skip to content

Commit

Permalink
chore(nix): Update dependencies. (#703)
Browse files Browse the repository at this point in the history
  • Loading branch information
dhess authored Feb 25, 2024
2 parents 8969cc2 + 9bc99fe commit db7a3f7
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 44 deletions.
24 changes: 12 additions & 12 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

68 changes: 36 additions & 32 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -334,38 +334,42 @@

# Bespoke tests which don't fit into `checks`, because
# they depend on the nixpkgs release-lib framework.
tests = {
tests =
(pkgs.lib.testing.nixos.importFromDirectory ./tests/fixtures
{
hostPkgs = pkgs;
defaults.imports = [ inputs.self.nixosModules.default ];
}
)
// (with import (inputs.nixpkgs + "/pkgs/top-level/release-lib.nix")
{
supportedSystems = [ "x86_64-linux" ];
scrubJobs = true;
nixpkgsArgs = {
config = {
allowUnfree = false;
allowBroken = true;
inHydra = true;
};
overlays = [
inputs.self.overlays.default
(import ./lib-tests)
];
};
};
mapTestOn {
dlnAttrSets = all;
dlnIPAddr = all;
dlnMisc = all;
dlnFfdhe = all;
dlnTypes = all;
});
};
#
# Note: disabled for now, as we're moving to a
# containerized CI environment that can't run VMs.

# tests = {
# tests =
# (pkgs.lib.testing.nixos.importFromDirectory ./tests/fixtures
# {
# hostPkgs = pkgs;
# defaults.imports = [ inputs.self.nixosModules.default ];
# }
# )
# // (with import (inputs.nixpkgs + "/pkgs/top-level/release-lib.nix")
# {
# supportedSystems = [ "x86_64-linux" ];
# scrubJobs = true;
# nixpkgsArgs = {
# config = {
# allowUnfree = false;
# allowBroken = true;
# inHydra = true;
# };
# overlays = [
# inputs.self.overlays.default
# (import ./lib-tests)
# ];
# };
# };
# mapTestOn {
# dlnAttrSets = all;
# dlnIPAddr = all;
# dlnMisc = all;
# dlnFfdhe = all;
# dlnTypes = all;
# });
# };

required = pkgs.releaseTools.aggregate {
name = "required-nix-ci";
Expand Down

0 comments on commit db7a3f7

Please sign in to comment.