mirror of
https://github.com/NixOS/nix
synced 2025-07-06 21:41:48 +02:00
Merge release.nix, shell.nix and release-common.nix into flake.nix
Also provide a Nixpkgs overlay, memoize Nixpkgs evaluation and fit the githubFlakes test.
This commit is contained in:
parent
90d6018509
commit
204291f059
9 changed files with 476 additions and 540 deletions
|
@ -1,8 +1,11 @@
|
|||
# Test Nix's remote build feature.
|
||||
|
||||
{ nixpkgs, system, nix }:
|
||||
{ nixpkgs, system, overlay }:
|
||||
|
||||
with import (nixpkgs + "/nixos/lib/testing.nix") { inherit system; };
|
||||
with import (nixpkgs + "/nixos/lib/testing.nix") {
|
||||
inherit system;
|
||||
extraConfigurations = [ { nixpkgs.overlays = [ overlay ]; } ];
|
||||
};
|
||||
|
||||
makeTest (
|
||||
|
||||
|
@ -13,7 +16,6 @@ let
|
|||
{ config, pkgs, ... }:
|
||||
{ services.openssh.enable = true;
|
||||
virtualisation.writableStore = true;
|
||||
nix.package = nix;
|
||||
nix.useSandbox = true;
|
||||
};
|
||||
|
||||
|
@ -59,7 +61,6 @@ in
|
|||
];
|
||||
virtualisation.writableStore = true;
|
||||
virtualisation.pathsInNixDB = [ config.system.build.extraUtils ];
|
||||
nix.package = nix;
|
||||
nix.binaryCaches = [ ];
|
||||
programs.ssh.extraConfig = "ConnectTimeout 30";
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue