nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-14 14:32:42 +01:00
Code Activity

Add hydraJobs.tests.nix-serve

Browse source
This commit is contained in:
Robert Hensing 2024-09-18 18:06:53 +02:00
parent cf5592c66a
commit 97bd6ebfed
4 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -139,6 +139,12 @@
nix = final.nixComponents.nix; 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 # See https://github.com/NixOS/nixpkgs/pull/214409
# Remove when fixed in this flake's nixpkgs # Remove when fixed in this flake's nixpkgs
pre-commit = pre-commit =

5
package.nix
View file

@ -27,6 +27,7 @@
, mdbook , mdbook
, mdbook-linkcheck , mdbook-linkcheck
, mercurial , mercurial
, nix-perl-bindings
, openssh , openssh
, openssl , openssl
, pkg-config , pkg-config
@ -334,6 +335,10 @@ in {
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
passthru = lib.optionalAttrs (stdenv.buildPlatform.canExecute stdenv.hostPlatform) {
perl-bindings = nix-perl-bindings;
};
meta = { meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
mainProgram = "nix"; mainProgram = "nix";

3
packaging/everything.nix
View file

@ -122,5 +122,8 @@
nix-main-c nix-main-c
; ;
}; };
}
// lib.optionalAttrs (stdenv.buildPlatform.canExecute stdenv.hostPlatform) {
perl-bindings = nix-perl-bindings;
}; };
}) })

7
tests/nixos/default.nix
View file

@ -160,3 +160,10 @@ in
cgroups = runNixOSTestFor "x86_64-linux" ./cgroups; 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;
})