diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-08 06:01:06 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-08 06:01:06 +0000 |
commit | b60b0a223e7335cd99c5e9b1873c68e97711ca17 (patch) | |
tree | ba3183661d2637aa8598d156b91ddbdd2f618c2e /pkgs/development/tools/skopeo/default.nix | |
parent | 4bf238a8fbdad042a3912cc1638cca9fd671ddb2 (diff) | |
parent | 46ee37ca1d9cd3bb18633b4104ef21d9035aac89 (diff) | |
download | nixpkgs-b60b0a223e7335cd99c5e9b1873c68e97711ca17.tar nixpkgs-b60b0a223e7335cd99c5e9b1873c68e97711ca17.tar.gz nixpkgs-b60b0a223e7335cd99c5e9b1873c68e97711ca17.tar.bz2 nixpkgs-b60b0a223e7335cd99c5e9b1873c68e97711ca17.tar.lz nixpkgs-b60b0a223e7335cd99c5e9b1873c68e97711ca17.tar.xz nixpkgs-b60b0a223e7335cd99c5e9b1873c68e97711ca17.tar.zst nixpkgs-b60b0a223e7335cd99c5e9b1873c68e97711ca17.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools/skopeo/default.nix')
-rw-r--r-- | pkgs/development/tools/skopeo/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 6d08ec9163f..aaae3082d32 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -11,6 +11,7 @@ , makeWrapper , fuse-overlayfs , dockerTools +, runCommand }: buildGoModule rec { @@ -46,6 +47,7 @@ buildGoModule rec { runHook preInstall PREFIX=$out make install-binary install-completions PREFIX=$man make install-docs + install ${passthru.policy}/default-policy.json -Dt $out/etc/containers '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/skopeo \ --prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]} @@ -53,8 +55,13 @@ buildGoModule rec { runHook postInstall ''; - passthru.tests = { - inherit (dockerTools.examples) testNixFromDockerHub; + passthru = { + policy = runCommand "policy" { } '' + install ${src}/default-policy.json -Dt $out + ''; + tests = { + inherit (dockerTools.examples) testNixFromDockerHub; + }; }; meta = with lib; { |