diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index e8824bd73fcd..7c96085d37f6 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -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; }; } diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index a13adad037d1..36b7709c56a8 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -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 [ diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 422ca4ac9cfa..40385940a942 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -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; }; }