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

folding@home: 6.02 -> 7.5.1 #82192

Merged
merged 1 commit into from Mar 14, 2020
Merged

folding@home: 6.02 -> 7.5.1 #82192

merged 1 commit into from Mar 14, 2020

Conversation

zimbatm
Copy link
Member

@zimbatm zimbatm commented Mar 9, 2020

Motivation for this change

Find a cure to Covid-19

Update folding@home. Things have changed quite a bit so I rebuilt everything from scratch.

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.

@zimbatm

This comment has been minimized.

@zimbatm
Copy link
Member Author

zimbatm commented Mar 11, 2020

How to test the PR

  1. Change your NIX_PATH to point to this PR.
  2. Add the following entries in your NixOS configuration:
{ pkgs, ... }:
{
  services.foldingathome.enable = true;
  environment.systemPackages = with pkgs; [ fahviewer fahcontrol ];
}
  1. nixos-rebuild switch
  2. Run FAHControl and look at the logs. You might also want to configure your Team ID to 236565 :)

The Covid-19 research happens in the "Any Disease" group, it doesn't look like it's possible to select it specifically.

@zimbatm
Copy link
Member Author

zimbatm commented Mar 11, 2020

image

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/fight-covid-19-with-folding-home-and-nixos/6202/1

@infinisil
Copy link
Member

Partial duplicate of #81768

@infinisil infinisil mentioned this pull request Mar 11, 2020
10 tasks
@Ma27 Ma27 self-requested a review March 11, 2020 23:56
@rissson
Copy link
Member

rissson commented Mar 13, 2020

You might also want to update the nixos module. It seems quite out of date

@zimbatm
Copy link
Member Author

zimbatm commented Mar 13, 2020

@rissson what do you mean, I rewrote it from scratch? :D

@rissson
Copy link
Member

rissson commented Mar 13, 2020

@zimbatm yes indeed I was looking at the old one. It would be nice to also have an option for the config.xml file

@zimbatm
Copy link
Member Author

zimbatm commented Mar 13, 2020

@rissson: now the FAHClient can be started with extra options and defaults to the NixOS Team ID. I think this approach is more reliable than providing the config.xml since the service expects the file to be mutable.

@jcumming
Copy link
Contributor

Thanks! I've started this on a few boxes now. :)

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

otherwise LGTM

pkgs/applications/science/misc/foldingathome/viewer.nix Outdated Show resolved Hide resolved
pkgs/applications/science/misc/foldingathome/viewer.nix Outdated Show resolved Hide resolved
pkgs/applications/science/misc/foldingathome/control.nix Outdated Show resolved Hide resolved
pkgs/applications/science/misc/foldingathome/control.nix Outdated Show resolved Hide resolved
@rissson
Copy link
Member

rissson commented Mar 13, 2020

@rissson: now the FAHClient can be started with extra options and defaults to the NixOS Team ID. I think this approach is more reliable than providing the config.xml since the service expects the file to be mutable.

So you recommend modifying the config with FAHControl then?

@zimbatm
Copy link
Member Author

zimbatm commented Mar 13, 2020

So you recommend modifying the config with FAHControl then?

FAHClient should configure the xml when started with the right arguments

The v7 series is very different.

This commit introduces the 3 packages: fahclient, fahcontrol and
fahviewer. It also rebuilds the NixOS module to map better with the new
client.
@zimbatm
Copy link
Member Author

zimbatm commented Mar 14, 2020

Ok I think this is ready. Rebased and squashed. I also added the NixOS module renamed options for back-compat.

@olejorgenb
Copy link
Contributor

olejorgenb commented Mar 14, 2020

Maybe add support for passkey also? https://foldingathome.org/support/faq/points/passkey/

(Since the .deb installer prompts for this)

@zimbatm
Copy link
Member Author

zimbatm commented Mar 14, 2020

I'd rather get this merged. The passkey support doesn't seem strictly necessary to me and can be added using FAHControl.

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

diff LGTM
programs seem to work

[13 built, 198 copied (1226.2 MiB), 235.5 MiB DL]
https://github.com/NixOS/nixpkgs/pull/82192
1 package blacklisted:
tests.nixos-functions.nixos-test

3 package built:
fahclient fahcontrol fahviewer

@jonringer jonringer merged commit 001be89 into NixOS:master Mar 14, 2020
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.

None yet

7 participants