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: 79676a26dc7d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 41ce7871ac62
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 13, 2019

  1. sshfs: add ssh program to the environment

    @minijackson
    minijackson committed Oct 13, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    gregberge Greg Bergé
    GPG key ID: C460B6AE35844C34
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6fe8884 View commit details

Commits on Oct 14, 2019

  1. Merge pull request #71072 from minijackson/ssh-in-sshfs-env 

    sshfs: add ssh program to the environment
    @primeos
    primeos authored Oct 14, 2019

    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
    41ce787 View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 pkgs/tools/filesystems/sshfs-fuse/default.nix
6 changes: 4 additions & 2 deletions pkgs/tools/filesystems/sshfs-fuse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, docutils
{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, docutils, makeWrapper
, fuse3, glib
, which, python3Packages
, openssh
}:

stdenv.mkDerivation rec {
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "0gvk8snivpi2sjidjnd9ypc66ny7lr0z9v4swl56rwjv539dkbx2";
};

nativeBuildInputs = [ meson pkgconfig ninja docutils ];
nativeBuildInputs = [ meson pkgconfig ninja docutils makeWrapper ];
buildInputs = [ fuse3 glib ];
checkInputs = [ which python3Packages.pytest ];

@@ -25,6 +26,7 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/sbin
ln -sf $out/bin/sshfs $out/sbin/mount.sshfs
wrapProgram $out/bin/sshfs --prefix PATH : "${openssh}/bin"
'';

#doCheck = true;