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

Jump to bottom

Blink + dependencies: update 3.0.3 -> 3.2.0 #68405

Merged
merged 5 commits into from Sep 17, 2019
Merged

Blink + dependencies: update 3.0.3 -> 3.2.0 #68405

merged 5 commits into from Sep 17, 2019

Conversation

leenaars
Copy link
Contributor

Motivation for this change

New version available, with version bump of all the dependencies.

Unsure how to deal with #65399 as this is PyQt based...

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.
Notify maintainers

cc @

@leenaars leenaars mentioned this pull request Sep 10, 2019
Closed
@ofborg ofborg bot requested a review from pSub September 10, 2019 07:35
@worldofpeace
Copy link
Contributor

Either of these approaches should work

mkDerivationWith python3.pkgs.buildPythonApplication {

  preFixup = ''
    wrapQtApp $out/bin/$executable
  '';
}

mkDerivationWith python3.pkgs.buildPythonApplication {

  dontWrapQtApps = true;

  makeWrapperArgs = [
    "\${qtWrapperArgs[@]}"
  ];
}

The first one happens to produce two wrappers, one from python another for qt.
The second one produces one wrapper.

@lheckemann lheckemann added this to the 20.03 milestone Sep 10, 2019
@leenaars
Copy link
Contributor Author

leenaars commented Sep 10, 2019 •
edited

Thanks, that works. Took the latter option.
Note that I also changed the invocation in pkgs/top-level/all-packages.nix from

blink = callPackage ../applications/networking/instant-messengers/blink { };

to

blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { };

worldofpeace
worldofpeace reviewed Sep 10, 2019
View reviewed changes
pkgs/applications/networking/instant-messengers/blink/default.nix Outdated
propagatedBuildInputs = with pythonPackages; [ pyqt5_with_qtwebkit cjson sipsimple twisted google_api_python_client ];
nativeBuildInputs = with pythonPackages; [ wrapQtAppsHook ];

propagatedBuildInputs = with pythonPackages; [ pyqt5_with_qtwebkit
Copy link
Contributor

Choose a reason for hiding this comment

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

This code style is generally unfavorable in nixpkgs now.

Please format like

propagatedBuildInputs = with pythonPackages; [
  pyqt5_with_qtwebkit
  ...
];

or follow what the rest of the file has.

worldofpeace
worldofpeace reviewed Sep 10, 2019
View reviewed changes
pkgs/applications/networking/instant-messengers/blink/default.nix Outdated
postInstall = ''
wrapProgram $out/bin/blink \
wrapQtApp $out/bin/blink \
Copy link
Contributor

Choose a reason for hiding this comment

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

You should drop this completely, suggestion above on how to replace it.

worldofpeace
worldofpeace reviewed Sep 10, 2019
View reviewed changes
pkgs/applications/networking/instant-messengers/blink/default.nix Outdated
@@ -1,22 +1,30 @@
{ stdenv, fetchdarcs, pythonPackages, libvncserver, zlib
, gnutls, libvpx, makeDesktopItem }:
, gnutls, libvpx, makeDesktopItem, mkDerivationWith, wrapQtAppsHook }:
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
, gnutls, libvpx, makeDesktopItem, mkDerivationWith, wrapQtAppsHook }:
, gnutls, libvpx, makeDesktopItem, mkDerivationWith }:

@worldofpeace worldofpeace marked this pull request as ready for review September 10, 2019 23:24
@leenaars
Copy link
Contributor Author

@worldofpeace: thanks, I took all you suggestions.

@worldofpeace worldofpeace merged commit 8f3421e into NixOS:master Sep 17, 2019
@aanderse
Copy link
Member

@pSub blink is broken on 19.09. I tried blink from master and this PR fixes the application. Are you able to backport this to 19.09?

@worldofpeace
Copy link
Contributor

worldofpeace commented Oct 17, 2019 •
edited

@aanderse I did try backporting this, but I didn't have time to review the python changes because it needs them to build. (and it does take a while to build)

@aanderse
Copy link
Member

@worldofpeace ok, thanks for the info.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace left review comments

@pSub pSub Awaiting requested review from pSub

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
20.03
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@leenaars @worldofpeace @aanderse @lheckemann