diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-09 15:46:00 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-09 15:46:00 +0200 |
commit | 74c24385cb2864f937031df74af14fc8060e1540 (patch) | |
tree | 5524856cfa11a449f4bef972fbc994bec6ff44cf /pkgs/tools/security | |
parent | 5c8472a2a17625855d0811ebb5709c9aa84fdd3f (diff) | |
parent | f0e38f7b3810b0f06bbe6908158fcb247d0e2dd3 (diff) | |
download | nixpkgs-74c24385cb2864f937031df74af14fc8060e1540.tar nixpkgs-74c24385cb2864f937031df74af14fc8060e1540.tar.gz nixpkgs-74c24385cb2864f937031df74af14fc8060e1540.tar.bz2 nixpkgs-74c24385cb2864f937031df74af14fc8060e1540.tar.lz nixpkgs-74c24385cb2864f937031df74af14fc8060e1540.tar.xz nixpkgs-74c24385cb2864f937031df74af14fc8060e1540.tar.zst nixpkgs-74c24385cb2864f937031df74af14fc8060e1540.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/kbfs/default.nix | 28 | ||||
-rw-r--r-- | pkgs/tools/security/keybase/kbfs.nix | 22 |
2 files changed, 22 insertions, 28 deletions
diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix deleted file mode 100644 index 9cd6ccca388..00000000000 --- a/pkgs/tools/security/kbfs/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix new file mode 100644 index 00000000000..302e996213d --- /dev/null +++ b/pkgs/tools/security/keybase/kbfs.nix @@ -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; + }; +} |