diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-06 06:31:43 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-06 16:51:00 -0400 |
| commit | bfe270bc54a2c09eceb84ddaf8eeb3ca78f38659 (patch) | |
| tree | 8f7f2c9f2228b33e8ae59f00813fe61f0dc6383f | |
| parent | c210b8b5f1f3e16dbbe1d4669644272795a48d8e (diff) | |
| download | nixlib-bfe270bc54a2c09eceb84ddaf8eeb3ca78f38659.tar nixlib-bfe270bc54a2c09eceb84ddaf8eeb3ca78f38659.tar.gz nixlib-bfe270bc54a2c09eceb84ddaf8eeb3ca78f38659.tar.bz2 nixlib-bfe270bc54a2c09eceb84ddaf8eeb3ca78f38659.tar.lz nixlib-bfe270bc54a2c09eceb84ddaf8eeb3ca78f38659.tar.xz nixlib-bfe270bc54a2c09eceb84ddaf8eeb3ca78f38659.tar.zst nixlib-bfe270bc54a2c09eceb84ddaf8eeb3ca78f38659.zip | |
kbfs: 2.11.0 -> 4.1.0
The kbfs code has been moved to the same repo as the keybase package.
| -rw-r--r-- | pkgs/tools/security/kbfs/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/tools/security/keybase/kbfs.nix | 22 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 23 insertions, 29 deletions
diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix deleted file mode 100644 index 9cd6ccca388c..000000000000 --- 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 000000000000..b94faebb9294 --- /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://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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93a14e062190..e1503a81d087 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3986,7 +3986,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 { }; |