nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-30 03:39:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55429 from worldofpeace/keybase-updates-backport

Browse Source 
[18.09] Keybase updates
This commit is contained in:
Wael Nasreddine
2019-03-02 11:54:22 -08:00
committed by GitHub
parent 80754f5cfd c0a99a5418
commit 07ead02f6b
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/security/kbfs/default.nix
View File

@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "kbfs-${version}";
version = "2.10.1";
version = "2.11.0";
goPackagePath = "github.com/keybase/kbfs";
subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ];
@@ -13,7 +13,7 @@ buildGoPackage rec {
owner = "keybase";
repo = "kbfs";
rev = "v${version}";
sha256 = "0c03jm4pxqh4cfg1d7c833hdl8l57f1sbfqxwdq16y5s2cac1yss";
sha256 = "1qlns7vpyj3ivm7d3vvlmx3iksl7hpcg87yh30f3n64c8jk0xc83";
};
buildFlags = [ "-tags production" ];
@@ -22,7 +22,7 @@ buildGoPackage rec {
homepage = https://www.keybase.io;
description = "The Keybase FS FUSE driver";
platforms = platforms.linux;
maintainers = with maintainers; [ bennofs np ];
maintainers = with maintainers; [ rvolosatovs bennofs np ];
license = licenses.bsd3;
};
}

12
pkgs/tools/security/keybase/default.nix
View File

@@ -1,22 +1,20 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub, cf-private
{ stdenv, lib, buildGoPackage, fetchurl, cf-private
, AVFoundation, AudioToolbox, ImageIO, CoreMedia
, Foundation, CoreGraphics, MediaToolbox
}:
buildGoPackage rec {
name = "keybase-${version}";
version = "2.10.1";
version = "3.0.0";
goPackagePath = "github.com/keybase/client";
subPackages = [ "go/keybase" ];
dontRenameImports = true;
src = fetchFromGitHub {
owner = "keybase";
repo = "client";
rev = "v${version}";
sha256 = "1gfxnqzs8msxmykg1zrhrrl2slmb29gl7b8s4m2g44zxaj91gfi9";
src = fetchurl {
url = "https://github.com/keybase/client/archive/v${version}.tar.gz";
sha256 = "1mxzihgd3qfahlmnfrpbg2kbixbjmkajrl964kaxmihrkx0fylvf";
};
buildInputs = lib.optionals stdenv.isDarwin [

11
pkgs/tools/security/keybase/gui.nix
View File

@@ -1,18 +1,18 @@
{ stdenv, fetchurl, alsaLib, atk, cairo, cups, udev, hicolor-icon-theme
, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gnome2, gtk3, gnome3
, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gtk3, gnome3
, libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook }:
let
versionSuffix = "20181121195344.99751ac04f";
versionSuffix = "20190205202117.6394d03e6c";
in
stdenv.mkDerivation rec {
name = "keybase-gui-${version}";
version = "2.11.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
version = "3.0.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
src = fetchurl {
url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
sha256 = "1gh7brdw2p4xfdgc43vrmv0lvki2f3691mfh6lvksy1dv43yb8zl";
sha256 = "0nwz0v6sqx1gd7spha09pk2bjbb8lgaxbrh0r6j6p0xzgzz6birw";
};
nativeBuildInputs = [
@@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
freetype
gdk_pixbuf
glib
gnome2.GConf
gnome3.gsettings-desktop-schemas
gtk3
libnotify
@@ -106,7 +105,7 @@ stdenv.mkDerivation rec {
homepage = https://www.keybase.io/;
description = "The Keybase official GUI";
platforms = platforms.linux;
maintainers = with maintainers; [ puffnfresh np ];
maintainers = with maintainers; [ rvolosatovs puffnfresh np ];
license = licenses.bsd3;
};
}