diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-22 15:59:42 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-22 15:59:42 +0100 |
| commit | 3fe32b675e1605cbc830fa52c0593747fa4dd7e2 (patch) | |
| tree | e0b31e2df8f0734290232b1b0d61d0716731e296 /pkgs/tools/security | |
| parent | a903c60c627f42461d3e6f9780d26a80f8e51470 (diff) | |
| parent | b7d4a356be49501ea046b28db28dc2807f5fccdb (diff) | |
| download | nixlib-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar nixlib-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.gz nixlib-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.bz2 nixlib-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.lz nixlib-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.xz nixlib-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.zst nixlib-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/keybase/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/security/keybase/gui.nix | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index b27b4ac24c0a..ae726544453a 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.11.0"; + version = "2.13.1"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; dontRenameImports = true; - src = fetchFromGitHub { - owner = "keybase"; - repo = "client"; - rev = "v${version}"; - sha256 = "1mj78cs6j0f1f86c71j4gdphas75j3rfaqygpy87dc40kc2yj0gd"; + src = fetchurl { + url = "https://github.com/keybase/client/archive/v${version}.tar.gz"; + sha256 = "0avq87y7cs3jipl444ssz1zd5jygpks20hls0fkqxxaikkpdsy4v"; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index a8c2d5ea4837..bd8166b214dc 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -3,16 +3,16 @@ , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook }: let - versionSuffix = "20190104191034.69b3ee25b7"; + versionSuffix = "20190115203650.eec94506e4"; in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "2.13.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "2.13.1"; # 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 = "5b188185dc6d594cd18876a2c955bb6481598c206f048cfd80ac2e7e8022241e"; + sha256 = "01663jknr8s4sp51mclw9llhx07ww6yh22apawxikvpwmw9yg2qr"; }; nativeBuildInputs = [ |