Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

keybase,kbfs,keybase-gui: 5.3.1 -> 5.4.2 #86185

Merged
merged 3 commits into from May 2, 2020
Merged

keybase,kbfs,keybase-gui: 5.3.1 -> 5.4.2 #86185

merged 3 commits into from May 2, 2020

Conversation

@Avaq
Copy link
Member

Avaq commented Apr 28, 2020

Motivation for this change

Keybase version 5.4.x offers improved conflict resolution for KBFS. Running this version, I was able to resolve a long standing file conflict previously unresolvable due to various issues.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

I have tested these changes by manually running keybase service, kbfsfuse, and keybase-gui and using the GUI to resolve some KBFS file conflicts I had, and send some chat messages. In doing so, I have verified that all the important bits are working.

Binaries untested:

  • kbnm in keybase
  • git-remote-keybase in kbfs
  • redirector in kbfs

EDIT: I am running this in my system now via an overlay, and have used other features, including the encrypted git remotes. No problems encountered.

@Avaq
Copy link
Member Author

Avaq commented Apr 28, 2020

I wasn't sure whether to add myself to package maintainers or not, but I'd be happy to help maintaining these packages, so I did. Please let me know if I misunderstood. :P

@Avaq Avaq force-pushed the Avaq:avaq/keybase branch from 3d067a7 to cf82ae4 Apr 29, 2020
Avaq added 3 commits Apr 28, 2020
@Avaq Avaq force-pushed the Avaq:avaq/keybase branch from cf82ae4 to beda02d Apr 29, 2020
@Avaq
Copy link
Member Author

Avaq commented May 1, 2020

@bennofs I switched to base32 for the hash. I think this PR is ready. I've been using this version of Keybase for 5 days using an overlay:

{ config, ... }:
{
  nixpkgs.overlays = [
    (self: super: let
      url = https://github.com/NixOS/nixpkgs/archive/3d067a7539860593cf60785e09d270c3c66c721f.tar.gz;
      unstable = import (fetchTarball url) { config = config.nixpkgs.config; };
    in {
      keybase = unstable.keybase;
      keybase-gui = unstable.keybase-gui;
      kbfs = unstable.kbfs;
    })
  ];
}
@bennofs
Copy link
Contributor

bennofs commented May 1, 2020

Thanks! I'll do a quick smoketest and then merge tomorrow

@Avaq
Copy link
Member Author

Avaq commented May 2, 2020

I just noticed this special treatment for Darwin:

keybase = callPackage ../tools/security/keybase {
# Reasoning for the inherited apple_sdk.frameworks:
# 1. specific compiler errors about: AVFoundation, AudioToolbox, MediaToolbox
# 2. the rest are added from here: https://github.com/keybase/client/blob/68bb8c893c5214040d86ea36f2f86fbb7fac8d39/go/chat/attachments/preview_darwin.go#L7
# #cgo LDFLAGS: -framework AVFoundation -framework CoreFoundation -framework ImageIO -framework CoreMedia -framework Foundation -framework CoreGraphics -lobjc
# with the exception of CoreFoundation, due to the warning in https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/darwin/apple-sdk/frameworks.nix#L25
inherit (darwin.apple_sdk.frameworks) AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox;
};

Introduced in #44698

Headers don't seem to have changed between Keybase versions, so I think we're good:

But I don't really understand what's going on there, and I can't test on Darwin. It might be worth testing on Darwin if someone can. 🤷‍♂️

@Avaq
Copy link
Member Author

Avaq commented May 2, 2020

Can anyone just request Graham of Borg to build the package? Should I try it? :o

@bennofs
Copy link
Contributor

bennofs commented May 2, 2020

@GrahamcOfBorg build keybase kbfs keybase-gui

@bennofs bennofs merged commit d51792f into NixOS:master May 2, 2020
2 checks passed
2 checks passed
kbfs, keybase, keybase-gui on aarch64-linux Success
Details
kbfs, keybase, keybase-gui on x86_64-linux Success
Details
@Avaq Avaq deleted the Avaq:avaq/keybase branch May 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.