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{,-gui}: 3.0.0 -> 4.1.0 #64375

Merged

Conversation

@das-g
Copy link
Contributor

commented Jul 6, 2019

Motivation for this change

Fix #64248 for stable branch by back-porting #60872, #62220 & #64275

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.

cinemast and others added some commits May 3, 2019

keybase,keybase-gui: 3.0.0 -> 3.2.2
(cherry picked from commit 59b235d)
keybase,keybase-gui: 3.2.2 -> 4.0.0
(cherry picked from commit 67406e2)
keybase: 4.0.0 -> 4.1.0
(cherry picked from commit 62ea7ba)
keybase-gui: 4.0.0 -> 4.1.0
(cherry picked from commit c5273fa)
@worldofpeace

This comment has been minimized.

Copy link
Member

commented Jul 6, 2019

KBFS still isn't up to date (#64248) so I don't think a backport would be appropriate yet.

@das-g

This comment has been minimized.

Copy link
Contributor Author

commented Jul 6, 2019

KBFS still isn't up to date (#64248) so I don't think a backport would appropriate yet.

Is it up-to-date on master?

@worldofpeace

This comment has been minimized.

Copy link
Member

commented Jul 6, 2019

No it isn't, see this comment at #50999 (comment) and it was also mentioned in #64248 (comment)

Additionally, the KBFS nix should point to the new remote, github.com/keybase/client with subPackages = [ "go/kbfs/kbfsfuse" "go/kbfs/kbfsgit/git-remote-keybase" ], and be on the same version as the other packages (4.1.0).

@das-g

This comment has been minimized.

Copy link
Contributor Author

commented Jul 6, 2019

Does that mean that #64275 was merged prematurely?

@worldofpeace

This comment has been minimized.

Copy link
Member

commented Jul 6, 2019

Does that mean that #64275 was merged prematurely?

Perhaps, I've opened #64377

@jonringer

This comment has been minimized.

Copy link
Contributor

commented Jul 6, 2019

I apologize, wasn't aware of this package.

Future facing, #64377 imports the keybase package as part of kbfs, which should fix the issue of nix-review not picking it up. Thank you @worldofpeace for your attention to detail :)

@worldofpeace

This comment has been minimized.

Copy link
Member

commented Jul 6, 2019

I apologize, wasn't aware of this package.

Future facing, #64377 imports the keybase package as part of kbfs, which should fix the issue of nix-review not picking it up. Thank you @worldofpeace for your attention to detail :)

You're welcome. And I think because kbfs uses keybase src it should cause a rebuild so maybe nix-review will pick it up.

worldofpeace added some commits Jul 6, 2019

kbfs: 2.11.0 -> 4.1.0
The kbfs code has been moved to the same
repo as the keybase package.

(cherry picked from commit bfe270b)
kbfs: update homepage and description
(cherry picked from commit d8bbbeb)
@worldofpeace

This comment has been minimized.

Copy link
Member

commented Jul 7, 2019

Ok this should be ready for someone to test it on stable.

@worldofpeace worldofpeace requested a review from kalbasit Jul 11, 2019

@kalbasit

This comment has been minimized.

Copy link
Member

commented Jul 13, 2019

@worldofpeace I'm actually running unstable, I won't be able to test beyond simply building it. @Ma27 maybe?

@das-g

This comment has been minimized.

Copy link
Contributor Author

commented Jul 13, 2019

I'm on stable (NixOS 19.03).

Can you give instructions on how to go about to test this? As a service is involved, I guess I'd have to install the to-be-tested version system-wide rather than simply run it with nix-shell or nix run.

@kalbasit

This comment has been minimized.

Copy link
Member

commented Jul 13, 2019

I'm on stable (NixOS 19.03).

Can you give instructions on how to go about to test this? As a service is involved, I guess I'd have to install the to-be-tested version system-wide rather than simply run it with nix-shell or nix run.

Precisely! I would point my nixpkgs to this specific PR and rebuild your system with Keybase and kbfs enabled.

@das-g

This comment has been minimized.

Copy link
Contributor Author

commented Jul 14, 2019

I've tested as follows:

preparation

  • Verify I'm on the right commit (d365f15):
    $ (cd ~/dev/nixos/nixpkgs/ ; git rev-parse HEAD)
    d365f15ed644f5dfe8dd5098eed6fe87f0338fa1
    
  • Modify /etc/nixos/configuration.nix to have
    services.keybase.enable = true;
    services.kbfs.enable = true;
    # ...
    environment.systemPackages = with pkgs; [
      # ...
      keybase
    ];
    
  • try to switch with
    sudo nixos-rebuild test -I nixpkgs=~/dev/nixos/nixpkgs/ --upgrade

That didn't succeed.

output (click to expand)
unpacking channels...
building Nix...
building the system configuration...
stopping the following units: accounts-daemon.service, alsa-store.service, audit.service, bluetooth.service, bolt.service, colord.service, cpufreq.service, cups.service, docker.service, docker.socket, kmod-static-nodes.service, network-link-vboxnet0.service, network-local-commands.service, network-manager.service, network-setup.service, nix-daemon.service, nix-daemon.socket, nscd.service, postgresql.service, rngd.service, rtkit-daemon.service, sshd.service, systemd-machined.service, systemd-modules-load.service, systemd-sysctl.service, systemd-timesyncd.service, systemd-tmpfiles-clean.timer, systemd-tmpfiles-setup-dev.service, systemd-udev-trigger.service, systemd-udevd-control.socket, systemd-udevd-kernel.socket, systemd-udevd.service, udisks2.service, upower.service, vboxnet0.service, wpa_supplicant.service
NOT restarting the following changed units: display-manager.service, getty@tty1.service, systemd-backlight@backlight:intel_backlight.service, systemd-backlight@leds:tpacpi::kbd_backlight.service, systemd-fsck@dev-disk-by\x2duuid-37BB\x2d937E.service, systemd-journal-flush.service, systemd-logind.service, systemd-random-seed.service, systemd-remount-fs.service, systemd-tmpfiles-setup.service, systemd-udev-settle.service, systemd-update-utmp.service, systemd-user-sessions.service, user-runtime-dir@1000.service, user@1000.service
activating the configuration...
removing user ‘sshd’
setting up /etc...
removing obsolete symlink ‘/etc/ssh/moduli’...
removing obsolete symlink ‘/etc/ssh/sshd_config’...
removing obsolete symlink ‘/etc/pam.d/sshd’...
restarting systemd...
reloading user units for das-g...
setting up tmpfiles
reloading the following units: dbus.service, dev-hugepages.mount, dev-mqueue.mount, firewall.service, sys-fs-fuse-connections.mount, sys-kernel-debug.mount
restarting the following units: network-addresses-vboxnet0.service, polkit.service, systemd-journald.service
Job for network-addresses-vboxnet0.service failed because the control process exited with error code.
See "systemctl status network-addresses-vboxnet0.service" and "journalctl -xe" for details.
starting the following units: accounts-daemon.service, alsa-store.service, audit.service, bluetooth.service, bolt.service, colord.service, cpufreq.service, cups.service, docker.socket, kmod-static-nodes.service, network-link-vboxnet0.service, network-local-commands.service, network-manager.service, network-setup.service, nix-daemon.socket, nscd.service, postgresql.service, rngd.service, rtkit-daemon.service, systemd-machined.service, systemd-modules-load.service, systemd-sysctl.service, systemd-timesyncd.service, systemd-tmpfiles-clean.timer, systemd-tmpfiles-setup-dev.service, systemd-udev-trigger.service, systemd-udevd-control.socket, systemd-udevd-kernel.socket, udisks2.service, upower.service, vboxnet0.service, wpa_supplicant.service
Job for network-link-vboxnet0.service failed because the control process exited with error code.
See "systemctl status network-link-vboxnet0.service" and "journalctl -xe" for details.
the following new units were started: NetworkManager-dispatcher.service, systemd-hostnamed.service
warning: the following units failed: network-addresses-vboxnet0.service, network-link-vboxnet0.service

● network-addresses-vboxnet0.service - Address configuration of vboxnet0
   Loaded: loaded (/nix/store/fdy5ga790g4ridaf7dpm9za3l6ypbvaa-unit-network-addresses-vboxnet0.service/network-addresses-vboxnet0.service; enabled; vendor preset: enabled)
   Active: failed (Result: exit-code) since Sun 2019-07-14 15:10:57 CEST; 1s ago
  Process: 4408 ExecStop=/nix/store/agfhqiv3vniy8bqlpxvfy3gzlsc41inh-unit-script-network-addresses-vboxnet0-pre-stop (code=exited, status=0/SUCCESS)
  Process: 4476 ExecStart=/nix/store/9m4zjwp20vgfjhs0jm1qs0lqr0mmlx8a-unit-script-network-addresses-vboxnet0-start (code=exited, status=1/FAILURE)
 Main PID: 4476 (code=exited, status=1/FAILURE)

Jul 14 15:10:57 nixos systemd[1]: Starting Address configuration of vboxnet0...
Jul 14 15:10:57 nixos 9m4zjwp20vgfjhs0jm1qs0lqr0mmlx8a-unit-script-network-addresses-vboxnet0-start[4476]: adding address 192.168.56.1/24... 'ip addr add 192.168.56.1/24 dev vboxnet0' failed: Cannot find device "vboxnet0"
Jul 14 15:10:57 nixos systemd[1]: network-addresses-vboxnet0.service: Main process exited, code=exited, status=1/FAILURE
Jul 14 15:10:57 nixos systemd[1]: network-addresses-vboxnet0.service: Failed with result 'exit-code'.
Jul 14 15:10:57 nixos systemd[1]: Failed to start Address configuration of vboxnet0.

● network-link-vboxnet0.service - Link configuration of vboxnet0
   Loaded: loaded (/nix/store/px0cd8sni5ppcdmrcnk6yiqghndfyv2r-unit-network-link-vboxnet0.service/network-link-vboxnet0.service; enabled; vendor preset: enabled)
   Active: failed (Result: exit-code) since Sun 2019-07-14 15:10:57 CEST; 1s ago
  Process: 4489 ExecStart=/nix/store/605c5v3wfrh93nw003irxl3hxpz0yc09-unit-script-network-link-vboxnet0-start (code=exited, status=1/FAILURE)
 Main PID: 4489 (code=exited, status=1/FAILURE)

Jul 14 15:10:57 nixos systemd[1]: Starting Link configuration of vboxnet0...
Jul 14 15:10:57 nixos 605c5v3wfrh93nw003irxl3hxpz0yc09-unit-script-network-link-vboxnet0-start[4489]: Configuring link...
Jul 14 15:10:57 nixos 605c5v3wfrh93nw003irxl3hxpz0yc09-unit-script-network-link-vboxnet0-start[4489]: bringing up interface... Cannot find device "vboxnet0"
Jul 14 15:10:57 nixos 605c5v3wfrh93nw003irxl3hxpz0yc09-unit-script-network-link-vboxnet0-start[4489]: failed
Jul 14 15:10:57 nixos systemd[1]: network-link-vboxnet0.service: Main process exited, code=exited, status=1/FAILURE
Jul 14 15:10:57 nixos systemd[1]: network-link-vboxnet0.service: Failed with result 'exit-code'.
Jul 14 15:10:57 nixos systemd[1]: Failed to start Link configuration of vboxnet0.
warning: error(s) occurred while switching to the new configuration

So I did

sudo nixos-rebuild boot -p test -I nixpkgs=~/dev/nixos/nixpkgs/

and then rebooted into the resulting profile.

tests done

(after rebooting into the test profile)

  • check that keybase --version reports 4.1.0
  • check that keybase without arguments lists usage info
  • started keybase-gui (as I had forgotten to add it to the configuration.nix, through nix run -f ~/dev/nixos/nixpkgs/ keybase-gui -c keybase-gui)
  • check that keybase-gui reports version 4.1.0-something
  • clicked around in GUI so see whether things seem to work
  • check whether the content I had stored in by keybase account is available at ~/keybase

👍

@worldofpeace

This comment has been minimized.

Copy link
Member

commented Jul 14, 2019

Sounds sufficiently tested, merging.

@worldofpeace worldofpeace merged commit c0339a7 into NixOS:release-19.03 Jul 14, 2019

13 checks passed

Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.