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: 6f43c82d3094
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 63834d63da87
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 4, 2020

  1. sshfs: 3.6.0 -> 3.7.0 

    Changelog: https://github.com/libfuse/sshfs/blob/sshfs-3.7.0/ChangeLog.rst
    @primeos
    primeos committed Jan 4, 2020
    Copy the full SHA
    63834d6 View commit details
Showing with 4 additions and 8 deletions.
  1. +4 −8 pkgs/tools/filesystems/sshfs-fuse/default.nix
12 changes: 4 additions & 8 deletions pkgs/tools/filesystems/sshfs-fuse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
{ stdenv, fetchFromGitHub, fetchpatch, meson, pkgconfig, ninja, docutils, makeWrapper
{ stdenv, fetchFromGitHub
, meson, pkgconfig, ninja, docutils, makeWrapper
, fuse3, glib
, which, python3Packages
, openssh
}:

stdenv.mkDerivation rec {
version = "3.6.0";
version = "3.7.0";
pname = "sshfs-fuse";

src = fetchFromGitHub {
owner = "libfuse";
repo = "sshfs";
rev = "sshfs-${version}";
sha256 = "0l4a6azsp920fhl4safxjam6821b77zxhw8mjgm33f60pksslww0";
sha256 = "119qvjaai3nqs2psqk2kv4gxjchrnrcfnmlwk7yxnj3v59pgyxhv";
};

patches = [ (fetchpatch {
url = "https://github.com/libfuse/sshfs/commit/a548abd1f33a8423bec72724a5f48eb96fa55dd2.patch";
sha256 = "19p94aw7nvydd7p2bd1f5cqhlhhamjhda31k22sg06xaqyl893jm";
}) ];

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