diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-09 15:44:08 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-09 15:44:08 +0200 |
| commit | 7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288 (patch) | |
| tree | 667a0a09fd26a37c54295d84a47482af67b1ff29 /pkgs/tools/security/keybase | |
| parent | 46d91410afc74d2c5ddf08921a6befb3da18784a (diff) | |
| parent | 5c8472a2a17625855d0811ebb5709c9aa84fdd3f (diff) | |
| download | nixpkgs-7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288.tar nixpkgs-7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288.tar.gz nixpkgs-7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288.tar.bz2 nixpkgs-7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288.tar.lz nixpkgs-7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288.tar.xz nixpkgs-7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288.tar.zst nixpkgs-7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/security/keybase')
| -rw-r--r-- | pkgs/tools/security/keybase/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/security/keybase/gui.nix | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index dc95ae706b2..e94289f048e 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -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 ]; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 843b9a57c8d..f84f0039347 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -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 = [ |