From a909083d4df1af5d34f048fe3c0d3ee9016d677d Mon Sep 17 00:00:00 2001 From: Vadim-Valdis Yudaev Date: Sat, 16 Nov 2019 02:47:47 +0200 Subject: [PATCH 1/3] keybase, keybase-gui: 4.7.2 -> 5.0.0 --- pkgs/tools/security/keybase/default.nix | 4 ++-- pkgs/tools/security/keybase/gui.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 653858d3696..4a68348c68d 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 = [ diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 1d32f1cc881..233b8282472 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 = "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 = [ From 5189a272378eaa2cc379b4cedeb494cc8a328dd6 Mon Sep 17 00:00:00 2001 From: Matthew O'Gorman Date: Mon, 28 Oct 2019 04:19:11 -0400 Subject: [PATCH 2/3] keybase-gui: add libappindicator-gtk3 See https://github.com/NixOS/nixpkgs/pull/72147 --- pkgs/tools/security/keybase/gui.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 233b8282472..2ec97f88236 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,5 +1,5 @@ { 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 }: @@ -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; From b568b813d818bf5c39963589730af56c5de768a8 Mon Sep 17 00:00:00 2001 From: Vadim-Valdis Yudaev Date: Sun, 17 Nov 2019 20:46:13 +0200 Subject: [PATCH 3/3] keybase: add license See issue: https://github.com/NixOS/nixpkgs/issues/43716 --- pkgs/tools/security/keybase/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 4a68348c68d..97c8ffb8948 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -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; }; }