Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 46effdb883e4
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dbda176a4c42
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Oct 22, 2018

  1. gvfs: Fix-up paths to gio binary

    @clefru
    clefru committed Oct 22, 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
    c00f567 View commit details

Commits on Nov 2, 2018

  1. nixos/google-compute-image: Fix network service 

    The google-network-daemon service should have type `simple`. (type
`oneshot` makes the service hang in startup).

See https://github.com/GoogleCloudPlatform/compute-image-packages/blob/d48fc3a5e2888422f168359946ee57cf18b74aad/google_compute_engine_init/systemd/google-network-daemon.service#L10

(cherry picked from commit c010c7547c9926dc5a235ff733a43747d34899dd)
    @rickynils
    rickynils committed Nov 2, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 6371839BF51BA5DA
    Learn about vigilant mode
    Copy the full SHA
    6861519 View commit details

  2. Merge pull request #48827 from clefru/gvfs-fix 

    gvfs: Fix-up paths to gio binary
    @7c6f434c
    7c6f434c authored Nov 2, 2018
    Copy the full SHA
    dbda176 View commit details
Showing with 4 additions and 1 deletion.
  1. +1 −1 nixos/modules/virtualisation/google-compute-image.nix
  2. +3 −0 pkgs/development/libraries/gvfs/default.nix
2 changes: 1 addition & 1 deletion nixos/modules/virtualisation/google-compute-image.nix
View file
Original file line number Diff line number Diff line change
@@ -144,7 +144,7 @@ in
path = with pkgs; [ iproute ];
serviceConfig = {
ExecStart = "${gce}/bin/google_network_daemon --debug";
Type = "oneshot";
Type = "simple";
};
};

3 changes: 3 additions & 0 deletions pkgs/development/libraries/gvfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -82,6 +82,9 @@ stdenv.mkDerivation rec {
doInstallCheck = doCheck;

preFixup = ''
for f in $out/bin/*; do
substituteInPlace $f --replace 'exec $replacement' 'exec ${glib.dev}/bin/$replacement'
done
for f in $out/libexec/*; do
wrapProgram $f \
${stdenv.lib.optionalString gnomeSupport "--prefix GIO_EXTRA_MODULES : \"${stdenv.lib.getLib gnome.dconf}/lib/gio/modules\""} \