mirror of
https://github.com/NixOS/nix.git
synced 2025-11-14 14:32:42 +01:00
Add hydraJobs.tests.nix-serve
This commit is contained in:
parent
cf5592c66a
commit
97bd6ebfed
4 changed files with 21 additions and 0 deletions
|
|
@ -139,6 +139,12 @@
|
|||
|
||||
nix = final.nixComponents.nix;
|
||||
|
||||
nix-serve =
|
||||
prev.nix-serve.override {
|
||||
# undo potential version pinning
|
||||
nix = final.nix;
|
||||
};
|
||||
|
||||
# See https://github.com/NixOS/nixpkgs/pull/214409
|
||||
# Remove when fixed in this flake's nixpkgs
|
||||
pre-commit =
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
, mdbook
|
||||
, mdbook-linkcheck
|
||||
, mercurial
|
||||
, nix-perl-bindings
|
||||
, openssh
|
||||
, openssl
|
||||
, pkg-config
|
||||
|
|
@ -334,6 +335,10 @@ in {
|
|||
|
||||
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
|
||||
|
||||
passthru = lib.optionalAttrs (stdenv.buildPlatform.canExecute stdenv.hostPlatform) {
|
||||
perl-bindings = nix-perl-bindings;
|
||||
};
|
||||
|
||||
meta = {
|
||||
platforms = lib.platforms.unix ++ lib.platforms.windows;
|
||||
mainProgram = "nix";
|
||||
|
|
|
|||
|
|
@ -122,5 +122,8 @@
|
|||
nix-main-c
|
||||
;
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs (stdenv.buildPlatform.canExecute stdenv.hostPlatform) {
|
||||
perl-bindings = nix-perl-bindings;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -160,3 +160,10 @@ in
|
|||
|
||||
cgroups = runNixOSTestFor "x86_64-linux" ./cgroups;
|
||||
}
|
||||
// (let
|
||||
inherit (nixpkgsFor."x86_64-linux".native) nixosTests;
|
||||
in {
|
||||
nix-serve =
|
||||
assert nixosTests.nix-serve.config.nodes.machine.services.nix-serve.package.nix == self.packages.x86_64-linux.nix;
|
||||
nixosTests.nix-serve;
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue