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

backport keybase from unstable #51264

Merged
merged 7 commits into from Dec 2, 2018

Conversation

Projects
None yet
7 participants
@kalbasit
Copy link
Member

kalbasit commented Nov 30, 2018

Motivation for this change

I received an email from Keybase that the version 2.6.0 that's currently on 18.09 has reach EOL and will no longer be maintained soon.

Fixes #50999

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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc @carlsverre @np @rvolosatovs @puffnfresh

@kalbasit

This comment has been minimized.

Copy link
Member Author

kalbasit commented Nov 30, 2018

I'm currently testing the PR on my NixOS and Darwin machines and will remove the label 2.status: work-in-progress once I am satisfied with it.

kalbasit added a commit to kalbasit/shabka that referenced this pull request Nov 30, 2018

kalbasit added a commit to kalbasit/shabka that referenced this pull request Nov 30, 2018

Merge remote-tracking branch 'origin/master' into shabka_manage-osx-w…
…ith-nix-darwin

* origin/master: (62 commits)
  external/home-manager: update to 40b279e3a33fd47b7e65e0303fcb9be621aeb7d3
  overlays: import NixOS/nixpkgs#51264
  home: i3: s for opening Studio with obs-studio in a floating workspace
  home: i3: m for opening Mail with Astroid
  home: i3: clean up obsolete and t for TaskWarrior through ptask
  network-manager: 1.12.2 -> 1.14.4
  hosts/zeus: update Plex to 1.13.9.5456
  home: workstation: setup SSH config from private network-secrets
  external/home-manager: update to 67ebe16b406950651de09448cd5afdb437545be6
  README: extract congruent definition to doc/congruent.md (#61)
  README: extract the documentation to doc/modules.md (#60)
  hosts/zeus: iscsid-nas: login only when a session does not already exist
  hosts/zeus: update the win10 XML
  hosts/zeus: iscsid-nas.service should be a oneshot service and remains after exit
  hosts/zeus: sshd: wait 5 seconds before restarting
  hosts/zeus: the sshd service should depend on network-addresses-ifcadmin.service
  hosts/zeus: load the iscsi_tcp kernel module required for iSCSI
  hosts/zeus: automate the creation and the starting of the Windows server. (#59)
  hosts/zeus: enable libvirtd and iscsid to host a Windows machine (#58)
  hosts/hades: remove Publica support from my personal workstation
  ...

@kalbasit kalbasit self-assigned this Dec 2, 2018

@kalbasit

This comment has been minimized.

Copy link
Member Author

kalbasit commented Dec 2, 2018

I completed the round of tests on Darwin and I'm comfortable with the backport. This PR is now ready for review.

@kalbasit kalbasit requested a review from Mic92 Dec 2, 2018

@Mic92

Mic92 approved these changes Dec 2, 2018

@c0bw3b

This comment has been minimized.

Copy link
Contributor

c0bw3b commented Dec 2, 2018

@GrahamcOfBorg build keybase keybase-gui

@c0bw3b

This comment has been minimized.

Copy link
Contributor

c0bw3b commented Dec 2, 2018

The kbfs package does not need to be updated along with KeyBase client?

jonafato and others added some commits Oct 11, 2018

keybase-gui: 2.5.0 -> 2.7.0
(cherry picked from commit 68ad1f8)
keybase: 2.5.0 -> 2.7.3
(cherry picked from commit 468d41d)
kbfs: 2.5.0 -> 2.6.0
(cherry picked from commit 254c5a0)
keybase: add cf-private on darwin
    Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in _x002.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in _x002.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in _x002.o
    ld: symbol(s) not found for architecture x86_64

(cherry picked from commit be9fc0d)
keybase-gui: 2.7.0 -> 2.11.0
- Use `autoPatchelfHook`
- Don't explicitly set phases - Part of #28910
- Correct `version` by hoisting out the suffix

(cherry picked from commit 02e9d06)
keybase: 2.7.3 -> 2.10.1
(cherry picked from commit 3fdbd98)
kbfs: 2.6.0 -> 2.10.1
(cherry picked from commit b49ed49)

@kalbasit kalbasit force-pushed the kalbasit:nixpkgs_update-keybase branch to 9678418 Dec 2, 2018

@kalbasit

This comment has been minimized.

Copy link
Member Author

kalbasit commented Dec 2, 2018

@c0bw3b you're right, I missed that one.

@GrahamcOfBorg build keybase keybase-gui kbfs

@c0bw3b

c0bw3b approved these changes Dec 2, 2018

@kalbasit kalbasit merged commit 205bbc3 into NixOS:release-18.09 Dec 2, 2018

9 checks passed

grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details

@kalbasit kalbasit deleted the kalbasit:nixpkgs_update-keybase branch Dec 2, 2018

@kalbasit kalbasit restored the kalbasit:nixpkgs_update-keybase branch Dec 3, 2018

kalbasit added a commit to kalbasit/shabka that referenced this pull request Dec 9, 2018

kalbasit added a commit to kalbasit/shabka that referenced this pull request Dec 9, 2018

@worldofpeace worldofpeace referenced this pull request Jan 8, 2019

Merged

Update keybase and related packages #53590

1 of 10 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.