From 697aed9d3bf1356665fb69ea0f7a3432884d789e Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 7 Jan 2019 19:40:17 +0100 Subject: [PATCH 1/9] kbfs: 2.10.1 -> 2.11.0 (cherry picked from commit a3a07429191533f578a4340e166b0fe6da2dc53a) --- pkgs/tools/security/kbfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index e8824bd73fcd..7c96085d37f6 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kbfs-${version}"; - version = "2.10.1"; + version = "2.11.0"; goPackagePath = "github.com/keybase/kbfs"; subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "kbfs"; rev = "v${version}"; - sha256 = "0c03jm4pxqh4cfg1d7c833hdl8l57f1sbfqxwdq16y5s2cac1yss"; + sha256 = "1qlns7vpyj3ivm7d3vvlmx3iksl7hpcg87yh30f3n64c8jk0xc83"; }; buildFlags = [ "-tags production" ]; @@ -22,7 +22,7 @@ buildGoPackage rec { homepage = https://www.keybase.io; description = "The Keybase FS FUSE driver"; platforms = platforms.linux; - maintainers = with maintainers; [ bennofs np ]; + maintainers = with maintainers; [ rvolosatovs bennofs np ]; license = licenses.bsd3; }; } From 980ae050bf745bbd4973b8f2989502c92e96a557 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 7 Jan 2019 19:41:18 +0100 Subject: [PATCH 2/9] keybase: 2.10.1 -> 2.11.0 (cherry picked from commit 563d4e2a770e824d57992d26957d78d1e5edc2e3) --- pkgs/tools/security/keybase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index a13adad037d1..b27b4ac24c0a 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "2.10.1"; + version = "2.11.0"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -16,7 +16,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "1gfxnqzs8msxmykg1zrhrrl2slmb29gl7b8s4m2g44zxaj91gfi9"; + sha256 = "1mj78cs6j0f1f86c71j4gdphas75j3rfaqygpy87dc40kc2yj0gd"; }; buildInputs = lib.optionals stdenv.isDarwin [ From 10defba5298ffb4ad1b730a7e2530402a8acbc21 Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Fri, 18 Jan 2019 22:53:04 +0700 Subject: [PATCH 3/9] keybase: 2.11.0 -> 2.13.1 (cherry picked from commit 239dc141bd3ce7c42fea923c130ba7e8aa8fc3d8) --- pkgs/tools/security/keybase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index b27b4ac24c0a..a8191d15fadd 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "2.11.0"; + version = "2.13.1"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -16,7 +16,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "1mj78cs6j0f1f86c71j4gdphas75j3rfaqygpy87dc40kc2yj0gd"; + sha256 = "13mkbr99k3i03vp28ab5y0h5fa1pfnbfjqq2fhh4j87d5h74ld13"; }; buildInputs = lib.optionals stdenv.isDarwin [ From e730b1b557d3adb1456f7501b4523606e45e1c10 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Sun, 20 Jan 2019 15:55:48 -0800 Subject: [PATCH 4/9] keybase: switch to fetchurl for sha256 consistency on Darwin fetchFromGitHub and thus fetchzip hashes the contents of the archive and not the archive itself. Unicode file names lead to different checksums on HFS+ vs. other file systems because of Unicode normalisation (cherry picked from commit f466c9f9610d7d3d7659b9c994d118bb7ad2e154) --- pkgs/tools/security/keybase/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index a8191d15fadd..ae726544453a 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, cf-private +{ stdenv, lib, buildGoPackage, fetchurl, cf-private , AVFoundation, AudioToolbox, ImageIO, CoreMedia , Foundation, CoreGraphics, MediaToolbox }: @@ -12,11 +12,9 @@ buildGoPackage rec { dontRenameImports = true; - src = fetchFromGitHub { - owner = "keybase"; - repo = "client"; - rev = "v${version}"; - sha256 = "13mkbr99k3i03vp28ab5y0h5fa1pfnbfjqq2fhh4j87d5h74ld13"; + src = fetchurl { + url = "https://github.com/keybase/client/archive/v${version}.tar.gz"; + sha256 = "0avq87y7cs3jipl444ssz1zd5jygpks20hls0fkqxxaikkpdsy4v"; }; buildInputs = lib.optionals stdenv.isDarwin [ From 1e00feaa4a3cef1f1cd48cbdcce4fdd9781c25e6 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 7 Feb 2019 20:55:14 -0500 Subject: [PATCH 5/9] keybase: 2.13.1 -> 3.0.0 (cherry picked from commit 1f332e7b54108d686b4658dd3e8c3a9b81317b7c) --- pkgs/tools/security/keybase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index ae726544453a..36b7709c56a8 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "2.13.1"; + version = "3.0.0"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -14,7 +14,7 @@ buildGoPackage rec { src = fetchurl { url = "https://github.com/keybase/client/archive/v${version}.tar.gz"; - sha256 = "0avq87y7cs3jipl444ssz1zd5jygpks20hls0fkqxxaikkpdsy4v"; + sha256 = "1mxzihgd3qfahlmnfrpbg2kbixbjmkajrl964kaxmihrkx0fylvf"; }; buildInputs = lib.optionals stdenv.isDarwin [ From ee3986387f6bca1ad528ff345d89212609d1de80 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 7 Jan 2019 19:41:48 +0100 Subject: [PATCH 6/9] keybase-gui: 2.11.0 -> 2.13.0 (cherry picked from commit 3bc377267794b23de1107c28b1b19cd7fbf535fe) --- pkgs/tools/security/keybase/gui.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 422ca4ac9cfa..a8c2d5ea4837 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 = "20181121195344.99751ac04f"; + versionSuffix = "20190104191034.69b3ee25b7"; in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "2.11.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "2.13.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 = "1gh7brdw2p4xfdgc43vrmv0lvki2f3691mfh6lvksy1dv43yb8zl"; + sha256 = "5b188185dc6d594cd18876a2c955bb6481598c206f048cfd80ac2e7e8022241e"; }; nativeBuildInputs = [ @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { homepage = https://www.keybase.io/; description = "The Keybase official GUI"; platforms = platforms.linux; - maintainers = with maintainers; [ puffnfresh np ]; + maintainers = with maintainers; [ rvolosatovs puffnfresh np ]; license = licenses.bsd3; }; } From f659d701d8fea24bafe595b8b50e27e99b9bfd78 Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Fri, 18 Jan 2019 22:53:22 +0700 Subject: [PATCH 7/9] keybase-gui: 2.13.0 -> 2.13.1 (cherry picked from commit 66d844ba598f7abededf2f91d2f6c43696280663) --- pkgs/tools/security/keybase/gui.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 = [ From 2d997e7a671eb9c8af3ca256aca9e090ab8a7a97 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 7 Feb 2019 21:07:21 -0500 Subject: [PATCH 8/9] keybase-gui: 2.13.1 -> 3.0.0 (cherry picked from commit 6d9c5259cfe9ba80dc2b12bb8d9866e3bc9b973c) --- pkgs/tools/security/keybase/gui.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index bd8166b214dc..d1a3e1706d3a 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 = "20190115203650.eec94506e4"; + versionSuffix = "20190205202117.6394d03e6c"; in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "2.13.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "3.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 = "01663jknr8s4sp51mclw9llhx07ww6yh22apawxikvpwmw9yg2qr"; + sha256 = "0nwz0v6sqx1gd7spha09pk2bjbb8lgaxbrh0r6j6p0xzgzz6birw"; }; nativeBuildInputs = [ From c0a99a54185dff9996ac39fdd5c2cc12493e1536 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 7 Feb 2019 22:15:03 -0500 Subject: [PATCH 9/9] keybase-gui: drop gnome2.GConf (cherry picked from commit ce8c243699808355e0a550c7bdebf4ca94f0480d) --- pkgs/tools/security/keybase/gui.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index d1a3e1706d3a..40385940a942 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, hicolor-icon-theme -, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gnome2, gtk3, gnome3 +, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gtk3, gnome3 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook }: let @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { freetype gdk_pixbuf glib - gnome2.GConf gnome3.gsettings-desktop-schemas gtk3 libnotify