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: 992a680fab09
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6e6c16f90e31
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 25, 2020

  1. pythonPackages.llfuse: darwin support via osxfuse

    @thefloweringash
    thefloweringash committed Jan 25, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    6d46f05 View commit details

  2. borgbackup: use llfuse on darwin

    @thefloweringash
    thefloweringash committed Jan 25, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    128db1b View commit details

  3. Merge pull request #78429 from thefloweringash/llfuse-darwin 

    pythonPackages.llfuse: darwin support, use in borgbackup
    @LnL7
    LnL7 authored Jan 25, 2020
    Copy the full SHA
    6e6c16f View commit details
Showing with 26 additions and 7 deletions.
  1. +24 −5 pkgs/development/python-modules/llfuse/default.nix
  2. +2 −2 pkgs/tools/backup/borg/default.nix
29 changes: 24 additions & 5 deletions pkgs/development/python-modules/llfuse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{ stdenv, fetchurl, buildPythonPackage, pkgconfig, pytest, fuse, attr, which
, contextlib2
{ stdenv, fetchurl, fetchpatch, buildPythonPackage, pkgconfig, pytest, fuse, attr, which
, contextlib2, osxfuse
}:

let
inherit (stdenv.lib) optionals optionalString;
in

buildPythonPackage rec {
pname = "llfuse";
version = "1.3.6";
@@ -11,14 +15,29 @@ buildPythonPackage rec {
sha256 = "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii";
};

patches = [
# https://github.com/python-llfuse/python-llfuse/pull/23 (2 commits)
(fetchpatch {
url = "https://github.com/python-llfuse/python-llfuse/commit/7579b0e626da1a7882b13caedcdbd4a834702e94.diff";
sha256 = "0vpybj4k222h20lyn0q7hz86ziqlapqs5701cknw8d11jakbhhb0";
})
(fetchpatch {
url = "https://github.com/python-llfuse/python-llfuse/commit/438c00ab9e10d6c485bb054211c01b7f8524a736.diff";
sha256 = "1zhb05b7k3c9mjqshy9in8yzpbihy7f33x1myq5kdjip1k50cwrn";
})
];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fuse ];
checkInputs = [ pytest attr which ];
buildInputs =
optionals stdenv.isLinux [ fuse ]
++ optionals stdenv.isDarwin [ osxfuse ];
checkInputs = [ pytest which ] ++
optionals stdenv.isLinux [ attr ];

propagatedBuildInputs = [ contextlib2 ];

checkPhase = ''
py.test -k "not test_listdir"
py.test -k "not test_listdir" ${optionalString stdenv.isDarwin ''-m "not uses_fuse"''}
'';

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/tools/backup/borg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,8 +17,8 @@ python3.pkgs.buildPythonApplication rec {
libb2 lz4 zstd openssl python3.pkgs.setuptools_scm
] ++ stdenv.lib.optionals stdenv.isLinux [ acl ];
propagatedBuildInputs = with python3.pkgs; [
cython
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ llfuse ];
cython llfuse
];

preConfigure = ''
export BORG_OPENSSL_PREFIX="${openssl.dev}"