From 444b84a8fb59d4d58816f348fdec7142356fba3c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 21 May 2020 11:26:16 +0000 Subject: [PATCH 1/2] google-compute-engine-oslogin: 20200325.00 -> 20200507.00 --- .../virtualization/google-compute-engine-oslogin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 2c2444de4e5..a16cd200775 100644 --- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "google-compute-engine-oslogin"; - version = "20200325.00"; + version = "20200507.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "guest-oslogin"; rev = version; - sha256 = "03hk95pgzcgy6ginp8zdy0fbk88m6n65qq22jq490z1xwbjffm8r"; + sha256 = "1np8c96sm29pwnxykc0id8kkgalhw576g43fgi1y936sr2hfvx3v"; }; postPatch = '' From 5fdf6a6f92dc9518883eb1ea1c28acdf44b8f82b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 21 May 2020 18:49:26 +0200 Subject: [PATCH 2/2] google-compute-engine-oslogin: add test passthru --- .../google-compute-engine-oslogin/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index a16cd200775..fcb8f5087b9 100644 --- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -1,10 +1,11 @@ { stdenv , lib -, fetchFromGitHub -, curl -, json_c -, pam , bashInteractive +, curl +, fetchFromGitHub +, json_c +, nixosTests +, pam }: stdenv.mkDerivation rec { @@ -42,6 +43,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit (nixosTests) google-oslogin; + }; + meta = with stdenv.lib; { homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages"; description = "OS Login Guest Environment for Google Compute Engine";