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

Merge pull request #73480 from judaew/keybase-update

Browse Source 
keybase, keybase-gui: 4.7.2 -> 5.0.0; add dependence, license
This commit is contained in:
Ryan Mulligan
2019-11-17 14:16:50 -08:00
committed by GitHub
parent f498b2ac0e b568b813d8
commit 2c7d994147
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/keybase/default.nix
+3 -2
View File
@@ -6,7 +6,7 @@
buildGoPackage rec { buildGoPackage rec {
pname = "keybase"; pname = "keybase";
version = "4.7.2"; version = "5.0.0";
goPackagePath = "github.com/keybase/client"; goPackagePath = "github.com/keybase/client";
subPackages = [ "go/keybase" ]; subPackages = [ "go/keybase" ];
@@ -17,7 +17,7 @@ buildGoPackage rec {
owner = "keybase"; owner = "keybase";
repo = "client"; repo = "client";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ixfq9qv71misg04fvf4892z956w5aydq0r1wk6qk5jjqp6gf4lv"; sha256 = "0cxxqmgp82qi2b1fljyfa38is94y8ghb2pd31nbyh8y4wnmi0x1s";
}; };
patches = [ patches = [
@@ -36,5 +36,6 @@ buildGoPackage rec {
description = "The Keybase official command-line utility and service."; description = "The Keybase official command-line utility and service.";
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ carlsverre np rvolosatovs ]; maintainers = with maintainers; [ carlsverre np rvolosatovs ];
license = licenses.bsd3;
}; };
} }
pkgs/tools/security/keybase/gui.nix
+6 -4
View File
@@ -1,19 +1,19 @@
{ stdenv, fetchurl, alsaLib, atk, cairo, cups, udev { 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 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook
, runtimeShell, gsettings-desktop-schemas }: , runtimeShell, gsettings-desktop-schemas }:
let let
versionSuffix = "20191028173732.6fc2e969b4"; versionSuffix = "20191114203213.f73f97dac6";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "keybase-gui"; 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 { src = fetchurl {
url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
sha256 = "01slhdxcjs1543rz1khxhzn25g26vm9fd9mcyd5ahp2v4g37b8sd"; sha256 = "e175e52a6355d8359d66ef4b445981b572c513754329d5c7f75ad7bb14ec348f";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
glib glib
gsettings-desktop-schemas gsettings-desktop-schemas
gtk3 gtk3
libappindicator-gtk3
libnotify libnotify
nspr nspr
nss nss
@@ -55,6 +56,7 @@ stdenv.mkDerivation rec {
runtimeDependencies = [ runtimeDependencies = [
udev.lib udev.lib
libappindicator-gtk3
]; ];
dontBuild = true; dontBuild = true;