Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 80754f5cfd69
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 07ead02f6b1e
Choose a head ref
  • 10 commits
  • 3 files changed
  • 4 contributors

Commits on Mar 1, 2019

  1. kbfs: 2.10.1 -> 2.11.0 

    (cherry picked from commit a3a0742)
    @rvolosatovs @worldofpeace
    rvolosatovs authored and worldofpeace committed Mar 1, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    697aed9 View commit details

  2. keybase: 2.10.1 -> 2.11.0 

    (cherry picked from commit 563d4e2)
    @rvolosatovs @worldofpeace
    rvolosatovs authored and worldofpeace committed Mar 1, 2019
    Copy the full SHA
    980ae05 View commit details

  3. keybase: 2.11.0 -> 2.13.1 

    (cherry picked from commit 239dc14)
    @worldofpeace
    Emmanuel Rosa authored and worldofpeace committed Mar 1, 2019
    Copy the full SHA
    10defba View commit details

  4. 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 f466c9f)
    @kalbasit @worldofpeace
    kalbasit authored and worldofpeace committed Mar 1, 2019
    Copy the full SHA
    e730b1b View commit details

  5. keybase: 2.13.1 -> 3.0.0 

    (cherry picked from commit 1f332e7)
    @worldofpeace
    worldofpeace committed Mar 1, 2019
    Copy the full SHA
    1e00fea View commit details

  6. keybase-gui: 2.11.0 -> 2.13.0 

    (cherry picked from commit 3bc3772)
    @rvolosatovs @worldofpeace
    rvolosatovs authored and worldofpeace committed Mar 1, 2019
    Copy the full SHA
    ee39863 View commit details

  7. keybase-gui: 2.13.0 -> 2.13.1 

    (cherry picked from commit 66d844b)
    @worldofpeace
    Emmanuel Rosa authored and worldofpeace committed Mar 1, 2019
    Copy the full SHA
    f659d70 View commit details

  8. keybase-gui: 2.13.1 -> 3.0.0 

    (cherry picked from commit 6d9c525)
    @worldofpeace
    worldofpeace committed Mar 1, 2019
    Copy the full SHA
    2d997e7 View commit details

  9. keybase-gui: drop gnome2.GConf 

    (cherry picked from commit ce8c243)
    @worldofpeace
    worldofpeace committed Mar 1, 2019
    Copy the full SHA
    c0a99a5 View commit details

Commits on Mar 2, 2019

  1. Merge pull request #55429 from worldofpeace/keybase-updates-backport 

    [18.09] Keybase updates
    @kalbasit
    kalbasit authored Mar 2, 2019
    Copy the full SHA
    07ead02 View commit details
Showing with 13 additions and 16 deletions.
  1. +3 −3 pkgs/tools/security/kbfs/default.nix
  2. +5 −7 pkgs/tools/security/keybase/default.nix
  3. +5 −6 pkgs/tools/security/keybase/gui.nix
6 changes: 3 additions & 3 deletions pkgs/tools/security/kbfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}
12 changes: 5 additions & 7 deletions pkgs/tools/security/keybase/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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.10.1";
version = "3.0.0";

goPackagePath = "github.com/keybase/client";
subPackages = [ "go/keybase" ];

dontRenameImports = true;

src = fetchFromGitHub {
owner = "keybase";
repo = "client";
rev = "v${version}";
sha256 = "1gfxnqzs8msxmykg1zrhrrl2slmb29gl7b8s4m2g44zxaj91gfi9";
src = fetchurl {
url = "https://github.com/keybase/client/archive/v${version}.tar.gz";
sha256 = "1mxzihgd3qfahlmnfrpbg2kbixbjmkajrl964kaxmihrkx0fylvf";
};

buildInputs = lib.optionals stdenv.isDarwin [
11 changes: 5 additions & 6 deletions pkgs/tools/security/keybase/gui.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{ 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
versionSuffix = "20181121195344.99751ac04f";
versionSuffix = "20190205202117.6394d03e6c";
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 = "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 = "1gh7brdw2p4xfdgc43vrmv0lvki2f3691mfh6lvksy1dv43yb8zl";
sha256 = "0nwz0v6sqx1gd7spha09pk2bjbb8lgaxbrh0r6j6p0xzgzz6birw";
};

nativeBuildInputs = [
@@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
freetype
gdk_pixbuf
glib
gnome2.GConf
gnome3.gsettings-desktop-schemas
gtk3
libnotify
@@ -106,7 +105,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;
};
}