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

weechatScripts.weechat-matrix: unstable-2019-11-10 -> unstable-2020-01-21 #79669

Merged
merged 2 commits into from Feb 10, 2020

Conversation

emilazy
Copy link
Member

@emilazy emilazy commented Feb 10, 2020

Motivation for this change

Updated the sources and dependencies for matrix-nio and its dependent weechat-matrix. Not tested extensively, but "it builds".

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.

@emilazy emilazy force-pushed the update-weechat-matrix branch 4 times, most recently from 4719f47 to cc6540e Compare February 10, 2020 00:39
@emilazy
Copy link
Member Author

emilazy commented Feb 10, 2020

Updated to include the new matrix_{decrypt,sso_helper} scripts.

@GrahamcOfBorg build weechatScripts.weechat-matrix

@emilazy
Copy link
Member Author

emilazy commented Feb 10, 2020

Missed a dependency for the SSO helper that wasn't actually affecting anything because it was coming in indirectly via requests... Python packaging is a mess.

@GrahamcOfBorg build weechatScripts.weechat-matrix

cc @tilpner

@emilazy
Copy link
Member Author

emilazy commented Feb 10, 2020

pushed with requested tweaks ^^

@ofborg ofborg bot requested a review from tilpner February 10, 2020 13:52
@Valodim
Copy link
Contributor

Valodim commented Feb 10, 2020

when I tested this I ran into #79646

@emilazy
Copy link
Member Author

emilazy commented Feb 10, 2020

As far as I'm aware that's just due to the nature of the nixpkgs WeeChat configuration; you need to ensure WeeChat's Python picks up the necessary package dependencies:

{ pkgs, ... }:

{
  environment.systemPackages = with pkgs; [
    # ...
    (weechat.override {
      configure = {availablePlugins, ...}: with weechatScripts; {
        plugins = with availablePlugins; [
          (python.withPackages (_: weechat-matrix.propagatedBuildInputs))
        ];
        scripts = [ weechat-matrix ];
      };
    })
    weechatScripts.weechat-matrix
  ];
}

It would be nicer if this happened automatically, but unless I'm mistaken I think it's orthogonal to this update.

@FRidh FRidh merged commit 6957e47 into NixOS:master Feb 10, 2020
@emilazy emilazy deleted the update-weechat-matrix branch February 10, 2020 19:12
@tilpner
Copy link
Member

tilpner commented Feb 11, 2020

python.withPackages (_: [ weechat-matrix ]) should be sufficient there, no need to explicitly pass propagatedBuildInputs around

@mjlbach
Copy link
Contributor

mjlbach commented Feb 13, 2020

@emilazy Is there a reason this is marked as unsupported on macOS? Seems to build fine.

@jonringer
Copy link
Contributor

probably a previous issue that blocked mac support. Pretty common

@emilazy
Copy link
Member Author

emilazy commented Feb 13, 2020

@mjlbach not to my knowledge; feel free to submit a PR that changes it to platforms.unix or platforms.all, or I'll try to remember to get around to it if I bump the package again.

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

6 participants