-
-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
29 changed files
with
204 additions
and
181 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
# Test for NixOS' container nesting. | ||
|
||
import ./make-test-python.nix ({ pkgs, ... }: { | ||
name = "nested"; | ||
|
||
meta = with pkgs.lib.maintainers; { maintainers = [ sorki ]; }; | ||
|
||
machine = { lib, ... }: | ||
let | ||
makeNested = subConf: { | ||
containers.nested = { | ||
autoStart = true; | ||
privateNetwork = true; | ||
config = subConf; | ||
}; | ||
}; | ||
in makeNested (makeNested { }); | ||
|
||
testScript = '' | ||
machine.start() | ||
machine.wait_for_unit("container@nested.service") | ||
machine.succeed("systemd-run --pty --machine=nested -- machinectl list | grep nested") | ||
print( | ||
machine.succeed( | ||
"systemd-run --pty --machine=nested -- systemd-run --pty --machine=nested -- systemctl status" | ||
) | ||
) | ||
''; | ||
}) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,29 @@ | ||
{ lib, mkCoqDerivation, coq, version ? null }: | ||
|
||
with lib; mkCoqDerivation { | ||
with lib; (mkCoqDerivation { | ||
pname = "tlc"; | ||
owner = "charguer"; | ||
inherit version; | ||
displayVersion = { tlc = false; }; | ||
defaultVersion = with versions; switch coq.coq-version [ | ||
{ case = range "8.12" "8.13"; out = "20210316"; } | ||
{ case = range "8.10" "8.12"; out = "20200328"; } | ||
{ case = range "8.6" "8.12"; out = "20181116"; } | ||
] null; | ||
release."20210316".sha256 = "1hlavnx20lxpf2iydbbxqmim9p8wdwv4phzp9ypij93yivih0g4a"; | ||
release."20200328".sha256 = "16vzild9gni8zhgb3qhmka47f8zagdh03k6nssif7drpim8233lx"; | ||
release."20181116".sha256 = "032lrbkxqm9d3fhf6nv1kq2z0mqd3czv3ijlbsjwnfh12xck4vpl"; | ||
|
||
installFlags = [ "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib" ]; | ||
|
||
meta = { | ||
homepage = "http://www.chargueraud.org/softs/tlc/"; | ||
description = "A non-constructive library for Coq"; | ||
license = licenses.free; | ||
maintainers = [ maintainers.vbgl ]; | ||
}; | ||
} | ||
}).overrideAttrs (x: | ||
if versionAtLeast x.version "20210316" | ||
then {} | ||
else { | ||
installFlags = [ "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib" ]; | ||
} | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.