public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-07-09 15:44:08 +02:00
parent 46d91410af 5c8472a2a1
commit 7cf5909fad
339 changed files with 11134 additions and 8903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -4,16 +4,16 @@
, runtimeShell, gsettings-desktop-schemas }:
let
versionSuffix = "20190508150240.6614a49937";
versionSuffix = "20190612201656.952fee6c59";
in
stdenv.mkDerivation rec {
name = "keybase-gui-${version}";
version = "4.0.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
version = "4.1.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 = "1fj92gxwfd6909r79prsq760b9s50js1iip5c01621hz9y39jd6m";
sha256 = "0jwxw75yz7sbvfqw2aksa3p7jlcv817743fl59qk6rq1x9ag6qpx";
};
nativeBuildInputs = [