Use new flake output naming convention
This commit is contained in:
parent
3e001a8f05
commit
481ca71d6e
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
overlays = [ self.overlay nix.overlays.default ];
|
overlays = [ self.overlays.default nix.overlays.default ];
|
||||||
};
|
};
|
||||||
|
|
||||||
# NixOS configuration used for VM tests.
|
# NixOS configuration used for VM tests.
|
||||||
|
@ -36,7 +36,7 @@
|
||||||
rec {
|
rec {
|
||||||
|
|
||||||
# A Nixpkgs overlay that provides a 'hydra' package.
|
# A Nixpkgs overlay that provides a 'hydra' package.
|
||||||
overlay = final: prev: {
|
overlays.default = final: prev: {
|
||||||
|
|
||||||
# Add LDAP dependencies that aren't currently found within nixpkgs.
|
# Add LDAP dependencies that aren't currently found within nixpkgs.
|
||||||
perlPackages = prev.perlPackages // {
|
perlPackages = prev.perlPackages // {
|
||||||
|
@ -547,11 +547,11 @@
|
||||||
checks.x86_64-linux.validate-openapi = hydraJobs.tests.validate-openapi;
|
checks.x86_64-linux.validate-openapi = hydraJobs.tests.validate-openapi;
|
||||||
|
|
||||||
packages.x86_64-linux.hydra = pkgs.hydra;
|
packages.x86_64-linux.hydra = pkgs.hydra;
|
||||||
defaultPackage.x86_64-linux = pkgs.hydra;
|
packages.x86_64-linux.default = pkgs.hydra;
|
||||||
|
|
||||||
nixosModules.hydra = {
|
nixosModules.hydra = {
|
||||||
imports = [ ./hydra-module.nix ];
|
imports = [ ./hydra-module.nix ];
|
||||||
nixpkgs.overlays = [ self.overlay nix.overlays.default ];
|
nixpkgs.overlays = [ self.overlays.default nix.overlays.default ];
|
||||||
};
|
};
|
||||||
|
|
||||||
nixosModules.hydraTest = {
|
nixosModules.hydraTest = {
|
||||||
|
|
Loading…
Reference in a new issue