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

kbfs: 2.11.0 -> 4.1.0 #64377

Merged
merged 2 commits into from Jul 7, 2019
Merged

kbfs: 2.11.0 -> 4.1.0 #64377

merged 2 commits into from Jul 7, 2019

Conversation

worldofpeace
Copy link
Contributor

The kbfs code has been moved to the same
repo as the keybase package.

Motivation for this change

Fixes #64248

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.

@worldofpeace worldofpeace mentioned this pull request Jul 6, 2019
10 tasks
@worldofpeace
Copy link
Contributor Author

I will merge this once I've manually tested this on master.

Copy link
Member

@kalbasit kalbasit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No modules upstream? 😣


dontRenameImports = true;

src = keybase.src;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
src = keybase.src;
inherit (keybase) src version;

And also remove version assignment above.

The kbfs code has been moved to the same
repo as the keybase package.
@worldofpeace
Copy link
Contributor Author

Thanks @kalbasit.

No modules upstream? 😣

Yeah unfortunately not. Seems that reorganization and things like that aren't a small task.

@kalbasit kalbasit merged commit 16aa355 into NixOS:master Jul 7, 2019
@worldofpeace worldofpeace deleted the kbfs branch July 7, 2019 01:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Keybase out of date, KBFS severely out of date
3 participants