mirror of
https://github.com/NixOS/nix
synced 2025-06-24 22:11:15 +02:00
Merge remote-tracking branch 'upstream/master' into messages-present-tense
This commit is contained in:
commit
d6710b4c04
43 changed files with 984 additions and 170 deletions
|
@ -1,21 +1,15 @@
|
|||
# Test the container built by ../../docker.nix.
|
||||
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
nixpkgs,
|
||||
hostPkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
pkgs = config.nodes.machine.nixpkgs.pkgs;
|
||||
|
||||
nixImage = import ../../docker.nix {
|
||||
inherit (config.nodes.machine.nixpkgs) pkgs;
|
||||
};
|
||||
nixUserImage = import ../../docker.nix {
|
||||
inherit (config.nodes.machine.nixpkgs) pkgs;
|
||||
nixImage = pkgs.callPackage ../../docker.nix { };
|
||||
nixUserImage = pkgs.callPackage ../../docker.nix {
|
||||
name = "nix-user";
|
||||
uid = 1000;
|
||||
gid = 1000;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue