3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #30098 from NeQuissimus/keybase_33

Keybase to 1.0.33
This commit is contained in:
Tim Steinbach 2017-10-04 22:01:33 -04:00 committed by GitHub
commit f66d92a161
3 changed files with 8 additions and 8 deletions

View file

@ -2,18 +2,18 @@
buildGoPackage rec { buildGoPackage rec {
name = "kbfs-${version}"; name = "kbfs-${version}";
version = "20170922.f76290"; version = "20171004.40555d";
goPackagePath = "github.com/keybase/kbfs"; goPackagePath = "github.com/keybase/kbfs";
subPackages = [ "kbfsfuse" ]; subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ];
dontRenameImports = true; dontRenameImports = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "keybase"; owner = "keybase";
repo = "kbfs"; repo = "kbfs";
rev = "f76290f6e1a8cbaa6046980c67c548fbff9e123a"; rev = "40555dbc9c93a05f3a82053860df30e45c7bd779";
sha256 = "1v086wmc0hly4b91y6xndfdhj981n2yr6nnb3rl6f4kwx291ih54"; sha256 = "08wj8fh1ja8kfzvbza5csy9mpfy39lifnzvfrnbj7vyyv88qc3h0";
}; };
buildFlags = [ "-tags production" ]; buildFlags = [ "-tags production" ];

View file

@ -37,10 +37,10 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "keybase-gui-${version}"; name = "keybase-gui-${version}";
version = "1.0.25-20170714172717.73f9070"; version = "1.0.33-20171003193427.d9ceb86ac";
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 = "0yrq18rrc30f7ymajvd71r29z1by7h6abyaxx2gmrg648qgc6zv4"; sha256 = "0sqani2fy5jzqmz35md1bdw2vwpx91l87b6s3x9z53halzq7vfy6";
}; };
phases = ["unpackPhase" "installPhase" "fixupPhase"]; phases = ["unpackPhase" "installPhase" "fixupPhase"];
unpackPhase = '' unpackPhase = ''

View file

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
name = "keybase-${version}"; name = "keybase-${version}";
version = "1.0.30"; version = "1.0.33";
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 = "0vivc71xfi4y3ydd29b17qxzi10r3a1ppmjjws6vrs0gz58bz1j8"; sha256 = "1zgvriyir2ga0p4ah9ia1sbl9ydnrnw5ggq4c1ya8gcfgn8vzdsf";
}; };
postInstall = stdenv.lib.optionalString stdenv.isDarwin '' postInstall = stdenv.lib.optionalString stdenv.isDarwin ''