diff options
| author | Ryan Mulligan <ryan@ryantm.com> | 2019-11-17 14:16:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-17 14:16:50 -0800 |
| commit | 2c7d9941477bf5c4308475cc5c475ab82d947611 (patch) | |
| tree | 5f43d9b94967e83d4ae0f92b180aaeb76e7a62ce /pkgs/tools/security | |
| parent | f498b2ac0ef2f33d808b9f516a421a0db0064323 (diff) | |
| parent | b568b813d818bf5c39963589730af56c5de768a8 (diff) | |
| download | nixlib-2c7d9941477bf5c4308475cc5c475ab82d947611.tar nixlib-2c7d9941477bf5c4308475cc5c475ab82d947611.tar.gz nixlib-2c7d9941477bf5c4308475cc5c475ab82d947611.tar.bz2 nixlib-2c7d9941477bf5c4308475cc5c475ab82d947611.tar.lz nixlib-2c7d9941477bf5c4308475cc5c475ab82d947611.tar.xz nixlib-2c7d9941477bf5c4308475cc5c475ab82d947611.tar.zst nixlib-2c7d9941477bf5c4308475cc5c475ab82d947611.zip | |
Merge pull request #73480 from judaew/keybase-update
keybase, keybase-gui: 4.7.2 -> 5.0.0; add dependence, license
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/keybase/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/security/keybase/gui.nix | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 653858d36961..97c8ffb89484 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "keybase"; - version = "4.7.2"; + version = "5.0.0"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "1ixfq9qv71misg04fvf4892z956w5aydq0r1wk6qk5jjqp6gf4lv"; + sha256 = "0cxxqmgp82qi2b1fljyfa38is94y8ghb2pd31nbyh8y4wnmi0x1s"; }; patches = [ @@ -36,5 +36,6 @@ buildGoPackage rec { description = "The Keybase official command-line utility and service."; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ carlsverre np rvolosatovs ]; + license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 1d32f1cc8819..2ec97f882367 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, alsaLib, atk, cairo, cups, udev -, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gtk3 +, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libappindicator-gtk3 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20191028173732.6fc2e969b4"; + versionSuffix = "20191114203213.f73f97dac6"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "4.7.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "5.0.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 = "01slhdxcjs1543rz1khxhzn25g26vm9fd9mcyd5ahp2v4g37b8sd"; + sha256 = "e175e52a6355d8359d66ef4b445981b572c513754329d5c7f75ad7bb14ec348f"; }; nativeBuildInputs = [ @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas gtk3 + libappindicator-gtk3 libnotify nspr nss @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { runtimeDependencies = [ udev.lib + libappindicator-gtk3 ]; dontBuild = true; |