Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8f2d5e6d0777
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: caaaaa7fbb58
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 5, 2018

  1. use interactive bash for gce

    @dingxiangfei2009
    dingxiangfei2009 committed Dec 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    SuperSandro2000 Sandro
    GPG key ID: 3AF5A43A3EECC2E5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f4414da View commit details

  2. Merge pull request #51495 from dingxiangfei2009/use-interactive-bash-… 

    …for-gce

Use Interactive bash for GCE
    @Mic92
    Mic92 authored Dec 5, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    caaaaa7 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/tools/virtualization/google-compute-engine/default.nix
3 changes: 2 additions & 1 deletion pkgs/tools/virtualization/google-compute-engine/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, fetchFromGitHub
, buildPythonApplication
, bash
, bashInteractive
, systemd
, utillinux
, boto
@@ -25,7 +26,7 @@ buildPythonApplication rec {
for file in $(find google_compute_engine -type f); do
substituteInPlace "$file" \
--replace /bin/systemctl "${systemd}/bin/systemctl" \
--replace /bin/bash "${bash}/bin/bash" \
--replace /bin/bash "${bashInteractive}/bin/bash" \
--replace /sbin/hwclock "${utillinux}/bin/hwclock"
# SELinux tool ??? /sbin/restorecon