diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:20:49 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:23:16 +0000 |
commit | 4999a38db7c5de0ea9f514a12ecd4133cce647f3 (patch) | |
tree | bbb659ab07fda4c9b98053499b7e3f046ac6d5dc /nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix | |
parent | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (diff) | |
parent | 8746c77a383f5c76153c7a181f3616d273acfa2a (diff) | |
download | nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.gz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.bz2 nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.lz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.xz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.zst nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.zip |
Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'
Diffstat (limited to 'nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix')
-rw-r--r-- | nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 012090ba079d..7251b418d4e0 100644 --- a/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -7,21 +7,22 @@ stdenv.mkDerivation rec { name = "google-compute-engine-oslogin-${version}"; - version = "1.4.3"; + version = "1.5.3"; + # from packages/google-compute-engine-oslogin/packaging/debian/changelog src = fetchFromGitHub { - repo = "compute-image-packages"; owner = "GoogleCloudPlatform"; - rev = "2ccfe80f162a01b5b7c3316ca37981fc8b3fc32a"; - sha256 = "036g7609ni164rmm68pzi47vrywfz2rcv0ad67gqf331pvlr92x1"; + repo = "compute-image-packages"; + rev = "20190522"; + sha256 = "16jbbrnz49g843h813r408dbvfa2hicf8canxwbfxr2kzhv7ycmm"; }; - sourceRoot = "source/google_compute_engine_oslogin"; + sourceRoot = "source/packages/google-compute-engine-oslogin"; postPatch = '' # change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles) substituteInPlace pam_module/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d # fix "User foo not allowed because shell /bin/bash does not exist" - substituteInPlace utils/oslogin_utils.cc --replace /bin/bash ${stdenv.shell} + substituteInPlace compat.h --replace /bin/bash ${stdenv.shell} ''; buildInputs = [ curl.dev pam ]; @@ -39,6 +40,8 @@ stdenv.mkDerivation rec { install -Dm755 google_{oslogin_nss_cache,authorized_keys} $out/bin ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = https://github.com/GoogleCloudPlatform/compute-image-packages; description = "OS Login Guest Environment for Google Compute Engine"; |