Merge pull request #64377 from worldofpeace/kbfs

kbfs: 2.11.0 ->  4.1.0
This commit is contained in:
Wael Nasreddine 2019-07-06 18:47:18 -07:00 committed by GitHub
commit 16aa35572b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 29 deletions

View file

@ -1,28 +0,0 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "kbfs-${version}";
version = "2.11.0";
goPackagePath = "github.com/keybase/kbfs";
subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ];
dontRenameImports = true;
src = fetchFromGitHub {
owner = "keybase";
repo = "kbfs";
rev = "v${version}";
sha256 = "1qlns7vpyj3ivm7d3vvlmx3iksl7hpcg87yh30f3n64c8jk0xc83";
};
buildFlags = [ "-tags production" ];
meta = with stdenv.lib; {
homepage = https://www.keybase.io;
description = "The Keybase FS FUSE driver";
platforms = platforms.unix;
maintainers = with maintainers; [ rvolosatovs bennofs np ];
license = licenses.bsd3;
};
}

View file

@ -0,0 +1,22 @@
{ stdenv, buildGoPackage, fetchFromGitHub, keybase }:
buildGoPackage rec {
pname = "kbfs";
inherit (keybase) src version;
goPackagePath = "github.com/keybase/client";
subPackages = [ "go/kbfs/kbfsfuse" "go/kbfs/kbfsgit/git-remote-keybase" ];
dontRenameImports = true;
buildFlags = [ "-tags production" ];
meta = with stdenv.lib; {
homepage = "https://keybase.io/docs/kbfs";
description = "The Keybase filesystem";
platforms = platforms.unix;
maintainers = with maintainers; [ rvolosatovs bennofs np ];
license = licenses.bsd3;
};
}

View file

@ -3992,7 +3992,7 @@ in
inherit (darwin.apple_sdk.frameworks) AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox;
};
kbfs = callPackage ../tools/security/kbfs { };
kbfs = callPackage ../tools/security/keybase/kbfs.nix { };
keybase-gui = callPackage ../tools/security/keybase/gui.nix { };