commit 812346c9c9d32c08e1928897c50876fa8e375a3a · pyrox.dev/nixpkgs

+27

pkgs/tools/virtualization/google-compute-engine/0001-allow-nologin-other-paths.patch

···

       1
       1
       +
       From 2e9ac201af238b742c7032962b9b12a8b66bab0c Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: zimbatm <zimbatm@zimbatm.com>

     

       3
       3
       +
       Date: Mon, 29 May 2017 22:36:15 +0100

     

       4
       4
       +
       Subject: [PATCH] allow nologin on other paths

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        google_compute_engine/accounts/accounts_utils.py | 4 ++--

     

       8
       8
       +
        1 file changed, 2 insertions(+), 2 deletions(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/google_compute_engine/accounts/accounts_utils.py b/google_compute_engine/accounts/accounts_utils.py

     

       11
       11
       +
       index 57e62be..d7eda06 100644

     

       12
       12
       +
       --- a/google_compute_engine/accounts/accounts_utils.py

     

       13
       13
       +
       +++ b/google_compute_engine/accounts/accounts_utils.py

     

       14
       14
       +
       @@ -295,8 +295,8 @@ class AccountsUtils(object):

     

       15
       15
       +
            # logins. This helps avoid problems caused by operator and root sharing

     

       16
       16
       +
            # a home directory in CentOS and RHEL.

     

       17
       17
       +
            pw_entry = self._GetUser(user)

     

       18
       18
       +
       -    if pw_entry and pw_entry.pw_shell == '/sbin/nologin':

     

       19
       19
       +
       -      message = 'Not updating user %s. User set /sbin/nologin as login shell.'

     

       20
       20
       +
       +    if pw_entry and os.path.basename(pw_entry.pw_shell) == 'nologin':

     

       21
       21
       +
       +      message = 'Not updating user %s. User set `nologin` as login shell.'

     

       22
       22
       +
              self.logger.debug(message, user)

     

       23
       23
       +
              return True

     

       24
       24
       +
        

     

       25
       25
       +
       -- 

     

       26
       26
       +
       2.13.0

     

       27
       27
       +

+55

pkgs/tools/virtualization/google-compute-engine/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , pythonPackages

     

       4
       4
       +
       , bash

     

       5
       5
       +
       , shadow

     

       6
       6
       +
       , systemd

     

       7
       7
       +
       , utillinux

     

       8
       8
       +
       }:

     

       9
       9
       +
       let

     

       10
       10
       +
         version = "20170523";

     

       11
       11
       +
       in

     

       12
       12
       +
       pythonPackages.buildPythonApplication {

     

       13
       13
       +
         name = "google-compute-engine-${version}";

     

       14
       14
       +
         namePrefix = "";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "GoogleCloudPlatform";

     

       18
       18
       +
           repo = "compute-image-packages";

     

       19
       19
       +
           rev = version;

     

       20
       20
       +
           sha256 = "1qxyj3lj9in6m8yi6y6wcmc3662h9z4qax07v97rdnay99mxdv68";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         patches = [ ./0001-allow-nologin-other-paths.patch ];

     

       24
       24
       +
       

     

       25
       25
       +
         postPatch = ''

     

       26
       26
       +
           for file in $(find google_compute_engine -type f); do

     

       27
       27
       +
             substituteInPlace "$file" \

     

       28
       28
       +
               --replace /bin/systemctl "${systemd}/bin/systemctl" \

     

       29
       29
       +
               --replace /bin/bash "${bash}/bin/bash" \

     

       30
       30
       +
               --replace /sbin/hwclock "${utillinux}/bin/hwclock"

     

       31
       31
       +
       

     

       32
       32
       +
             # SELinux tool ???  /sbin/restorecon

     

       33
       33
       +
           done

     

       34
       34
       +
       

     

       35
       35
       +
           substituteInPlace google_config/udev/64-gce-disk-removal.rules \

     

       36
       36
       +
             --replace /bin/sh "${bash}/bin/sh" \

     

       37
       37
       +
             --replace /bin/umount "${utillinux}/bin/umount" \

     

       38
       38
       +
             --replace /usr/bin/logger "${utillinux}/bin/logger"

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         postInstall = ''

     

       42
       42
       +
           # allows to install the package in `services.udev.packages` in NixOS

     

       43
       43
       +
           mkdir -p $out/lib/udev/rules.d

     

       44
       44
       +
           cp -r google_config/udev/*.rules $out/lib/udev/rules.d

     

       45
       45
       +
         '';

     

       46
       46
       +
       

     

       47
       47
       +
         propagatedBuildInputs = with pythonPackages; [ boto setuptools ];

     

       48
       48
       +
       

     

       49
       49
       +
         meta = with lib; {

     

       50
       50
       +
           description = "Google Compute Engine tools and services";

     

       51
       51
       +
           homepage = https://github.com/GoogleCloudPlatform/compute-image-packages;

     

       52
       52
       +
           license = licenses.asl20;

     

       53
       53
       +
           maintainers = with maintainers; [ zimbatm ];

     

       54
       54
       +
         };

     

       55
       55
       +
       }

pkgs/top-level/all-packages.nix

···

       2191
       2191
        
       

     

       2192
       2192
        
         google-fonts = callPackage ../data/fonts/google-fonts { };

     

       2193
       2193
        
       

     

       2194
       2194
       +
         google-compute-engine = callPackage ../tools/virtualization/google-compute-engine {  };

     

       2195
       2195
       +
       

     

       2194
       2196
        
         gource = callPackage ../applications/version-management/gource { };

     

       2195
       2197
        
       

     

       2196
       2198
        
         gpart = callPackage ../tools/filesystems/gpart { };