BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #27436 from np/keybase-update

Browse source 
Keybase updates
This commit is contained in:
Aristid Breitkreuz 2017-07-17 22:27:47 +02:00 committed by GitHub
commit 6793f27b23
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/tools/security/kbfs/default.nix
View file

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
name = "kbfs-${version}"; name = "kbfs-${version}";
version = "20170209.d1db463"; version = "20170429.44efa06";
goPackagePath = "github.com/keybase/kbfs"; goPackagePath = "github.com/keybase/kbfs";
subPackages = [ "kbfsfuse" ]; subPackages = [ "kbfsfuse" ];
@ -12,8 +12,8 @@ buildGoPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "keybase"; owner = "keybase";
repo = "kbfs"; repo = "kbfs";
rev = "d1db46315d9271f21ca2700a84ca19767e638296"; rev = "44efa0682d931d8489f5e84542e8d00baeb12592";
sha256 = "12i2m370r27mmn37s55krdkhr5k8kpl3x8y3gzg7w5zn2wiw8i1g"; sha256 = "1q6hklyr6zq3xr1azz1c6rlpsjc036f222cd20vf79m58dn906n5";
}; };
buildFlags = [ "-tags production" ]; buildFlags = [ "-tags production" ];
@ -22,6 +22,6 @@ buildGoPackage rec {
homepage = https://www.keybase.io; homepage = https://www.keybase.io;
description = "The Keybase FS FUSE driver"; description = "The Keybase FS FUSE driver";
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ bennofs ]; maintainers = with maintainers; [ bennofs np ];
}; };
} }

9
pkgs/tools/security/keybase-gui/default.nix
View file

@ -22,7 +22,7 @@ let
pango pango
systemd systemd
xorg.libX11 xorg.libX11
xorg.libXScrnSaver xorg.libxcb
xorg.libXcomposite xorg.libXcomposite
xorg.libXcursor xorg.libXcursor
xorg.libXdamage xorg.libXdamage
@ -31,15 +31,16 @@ let
xorg.libXi xorg.libXi
xorg.libXrandr xorg.libXrandr
xorg.libXrender xorg.libXrender
xorg.libXScrnSaver
xorg.libXtst xorg.libXtst
]; ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "keybase-gui-${version}"; name = "keybase-gui-${version}";
version = "1.0.23-20170519175207.d6c5e9e"; version = "1.0.25-20170714172717.73f9070";
src = fetchurl { src = fetchurl {
url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb";
sha256 = "14nylwpd64ngx1kdb4pk2laghslx9872fb2a9jgkbgbgnan5nkmm"; sha256 = "0yrq18rrc30f7ymajvd71r29z1by7h6abyaxx2gmrg648qgc6zv4";
}; };
phases = ["unpackPhase" "installPhase" "fixupPhase"]; phases = ["unpackPhase" "installPhase" "fixupPhase"];
unpackPhase = '' unpackPhase = ''
@ -86,6 +87,6 @@ stdenv.mkDerivation rec {
homepage = https://www.keybase.io/; homepage = https://www.keybase.io/;
description = "The Keybase official GUI."; description = "The Keybase official GUI.";
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ puffnfresh ]; maintainers = with maintainers; [ puffnfresh np ];
}; };
} }

6
pkgs/tools/security/keybase/default.nix
View file

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
name = "keybase-${version}"; name = "keybase-${version}";
version = "1.0.20"; version = "1.0.22";
goPackagePath = "github.com/keybase/client"; goPackagePath = "github.com/keybase/client";
subPackages = [ "go/keybase" ]; subPackages = [ "go/keybase" ];
@ -13,7 +13,7 @@ buildGoPackage rec {
owner = "keybase"; owner = "keybase";
repo = "client"; repo = "client";
rev = "v${version}"; rev = "v${version}";
sha256 = "1418x2z1j4bzq29qab8pmqrvg8piycqcabdjmq2inkvlll3s5n3v"; sha256 = "1642d11gjgkdklppmm1j3vwc2r3qg9qqw5x07jnqs819i57mr47f";
}; };
buildFlags = [ "-tags production" ]; buildFlags = [ "-tags production" ];
@ -22,6 +22,6 @@ buildGoPackage rec {
homepage = https://www.keybase.io/; homepage = https://www.keybase.io/;
description = "The Keybase official command-line utility and service."; description = "The Keybase official command-line utility and service.";
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ carlsverre ]; maintainers = with maintainers; [ carlsverre np ];
}; };
} }