diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-05-26 00:20:17 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-05-26 00:20:17 +0000 |
| commit | ad35019501e6b263e08ecb4c66f1ee6e3eee80f1 (patch) | |
| tree | 492149cd4a5da50945a5bc7d5fa62de432590dea /pkgs/tools/filesystems | |
| parent | 98f2f08b4b9b204912c1c097a08cd26151fae0bb (diff) | |
| parent | 97e376bf9cafa2d6c812221677f2e38163d0acb8 (diff) | |
Merge branch 'master' into staging
Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/9pfs/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/ntfs-3g/default.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index 5ad54adc08adc..37ec4105472b4 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fuse }: stdenv.mkDerivation rec { - name = "9pfs"; + name = "9pfs-20150918"; src = fetchFromGitHub { owner = "mischief"; diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 4bcef5a83f046..7ee54a63fbb8e 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -6,6 +6,8 @@ stdenv.mkDerivation rec { version = "2017.3.23"; name = "${pname}-${version}"; + outputs = [ "out" "dev" "man" "doc" ]; + buildInputs = [ libuuid ] ++ stdenv.lib.optionals crypto [ gnutls libgcrypt ]; nativeBuildInputs = stdenv.lib.optional crypto pkgconfig; |