Fix cairocffi build #56839

avnik · 2019-03-04T19:52:05Z

Motivation for this change

cairocffi doesn't build, preventing qtile from build.
(patch doesn't applying correctly)

Patch was refreshed, as well as more packages required for tests added.

/cc @FRidh

Things done

FRidh · 2019-03-05T08:29:45Z

@GrahamcOfBorg python2.pkgs.cairocffi python3.pkgs.cairocffi

avnik · 2019-03-05T09:09:07Z

On Tue, Mar 05, 2019 at 12:29:50AM -0800, Frederik Rietdijk wrote: @GrahamcOfBorg python2.pkgs.cairocffi python3.pkgs.cairocffi

FYI cairocffi is 3.5+ library now. Probably I should add assert as well.

FRidh · 2019-03-05T09:10:20Z

@GrahamcOfBorg build python3.pkgs.cairocffi

avnik · 2019-03-05T10:06:09Z

On Tue, Mar 05, 2019 at 01:10:25AM -0800, Frederik Rietdijk wrote: Added ``disabled = pythonOlder "3.5"`` stanza

Ma27 · 2019-03-07T19:44:28Z

@FRidh @avnik I'd propose to add an cairoffi_1 package as well (similar to cairosvg1) to retain Python 2 support for now. This affects thumbor, graphite-web and cairosvg1 and I think it's too early to drop Python 2 support if some dependants still need it.

Also wondering if the Python update script should contain some functionality to actually test the package before bumping it (and pushing this to master).

avnik · 2019-03-07T20:22:21Z

@Ma27 cairocffi_py2 be better name, than _1.

Other option -- add some backporing patch to this package, I am ok with both solutions.

Ma27 · 2019-03-07T20:37:39Z

cairocffi_py2 be better name, than _1.

Ack. Didn't look at the package's version when writing this 😅

Other option -- add some backporing patch to this package, I am ok with both solutions.

Can you please be more precise in what you mean? Not sure if I understand correctly what you meant :)

avnik · 2019-03-07T22:54:44Z

On Thu, Mar 07, 2019 at 08:37:44PM +0000, Maximilian Bosch wrote: > Other option -- add some backporing patch to this package, I am ok with both solutions. Can you please be more precise in what you mean? Not sure if I understand correctly what you meant :)

I mean, if you take commit, which removing 2.x support, make reversing patch, and will support it ;) If you want overtake cairoffi, you are welcomed -- I care about it, because it transitive dependency of qtile.

Ma27 · 2019-03-09T14:07:41Z

I mean, if you take commit, which removing 2.x support, make reversing patch, and will support it ;)

I doubt that it'll be that easy. Python 2.x and 3.x diverge pretty much.

But I'll have a look at this and see how to proceed here :)

avnik · 2019-03-09T14:23:11Z

On Sat, Mar 09, 2019 at 06:07:44AM -0800, Maximilian Bosch wrote: > I mean, if you take commit, which removing 2.x support, make reversing patch, and will support it ;) I doubt that it'll be that easy. Python 2.x and 3.x diverge pretty much.

I know. I am in middle of porting mid size project from 2.x and gevent to 3.x and aio. Lot of pain and sorrows ;)

Ma27 · 2019-03-09T22:21:05Z

Just a short update: I created a cairocffi_0_9 package locally and played around with it. I'll push this tomorrow to this PRs branch as I'm fairly sleepy atm :)

Ma27 · 2019-03-10T10:27:53Z

I pushed three commits on top of your branch:

8d23630: qasm2image doesn't support Python older than 3.5. It's more obvious to raise an error since this package doesn't support old Python rather than breaking the evaluation when trying to use the cairocffi derivation.
ad550de: move the entire cairocffi build instructions into a generic function that is invoked for cairocffi 1.0 and 0.9. The older version should be supported for now to keep older software like thumbor working. I'd probably revert that before 19.09 as Python 2.x will be dropped by the end of the year.

This affects the following packages:
- cairosvg1: Built with cairocffi 1.x by default, but when using Python 2.x (which is still supported here), cairocffi can be overridden by cairocffi_0_9. (Also wondering if we should add a cairosvg1_py2 to make this more obvious.
- thumbor: Python 3.x support is in progress, but until then we can only build with Python 2 here.
- graphite-api with Python 2.x (nix-build -E 'with import ./. {}; pythonPackages.graphite_api.override { cairocffi = pythonPackages.cairocffi_0_9; }')
- graphite_web (doesn't work with Python 3.x)
- and probably some more...
da86a8e: unbreak thumbor (by using cairocffi_0_9 and adding some minor fixes to the test suite).

@FRidh @avnik it would be great if you could review this as well :)

dotlambda · 2019-03-11T12:09:34Z

pkgs/top-level/python-packages.nix

@@ -1311,7 +1311,7 @@ in {

  canmatrix = callPackage ../development/python-modules/canmatrix {};

-  cairocffi = callPackage ../development/python-modules/cairocffi {};
+  inherit (callPackage ../development/python-modules/cairocffi {}) cairocffi cairocffi_0_9;


How about

Suggested change

inherit (callPackage ../development/python-modules/cairocffi {}) cairocffi cairocffi_0_9;

cairocffi = if isPy3k then

(callPackage ../development/python-modules/cairocffi {}).cairocffi

else

(callPackage ../development/python-modules/cairocffi {}).cairocffi_0_9;

You're right! That made the fix for thumbor far easier. I also exposed cairocffi_1_0 and cairocffi_0_9 for now as it seems to be a common pattern to add all versioned attributes to the package set and alias one of those to the default package name.

I'd prefer not to expose them because pythonPackages should only contain a single version of each package. Btw, I think the prettiest way to do this is by using let inherit (calPackage ...) cairocffi cairocffi_0_9; in if isPy3k ....

dotlambda

The commit messages for cairocffi should say pythonPackages.cairocffi: ....

According to `setup.py` in 0.8 older Python wouldn't work.

This patch ensures that the currently broken `thumbor`[1] package builds and works again. The following problems were fixed: * Rather than placing required packages (like `gifsicle` or `exiftool`) into the build input list, we reference them explicitly where needed to ensure that the package works after the build without further installs. * Skip the `test_redeye_applied` test case which is broken for a while now. [1] https://hydra.nixos.org/build/90290998

This patch ensures that Python2 can be used if cairocffi is used. Version 1.0 dropped Python 2 support.

dotlambda · 2019-03-13T22:51:10Z

Cherry picked in ab89b6b..3274b1d.

Btw, I also pushed f721655 (cherry picked in cdc714f).

kamilchm · 2019-03-18T00:38:29Z

@avnik is there a way to use it with overridden withXcffib like in

nixpkgs/pkgs/applications/window-managers/qtile/default.nix

Lines 3 to 6 in 6004e5d

    
           let cairocffi-xcffib = python37Packages.cairocffi.override { 
        
               withXcffib = true; 
        
             }; 
        
           in

?
I can't make it work after this change.

dotlambda · 2019-03-18T05:51:32Z

@kamilchm Sorry for messing that up. An easy way to make it work would be to use three files: default.nix and 0_9.nix, which both call common.nix. I'll make the change once I have time for it.

avnik requested a review from FRidh as a code owner March 4, 2019 19:52

GrahamcOfBorg added 6.topic: python 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Mar 4, 2019

GrahamcOfBorg added 8.has: clean-up 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 and removed 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Mar 5, 2019

GrahamcOfBorg added the 8.has: package (new) label Mar 10, 2019

GrahamcOfBorg requested a review from Ma27 March 10, 2019 10:28

GrahamcOfBorg added 10.rebuild-linux: 11-100 and removed 10.rebuild-linux: 1-10 labels Mar 10, 2019

Ma27 force-pushed the fix/cairocffi branch from da86a8e to 65d3713 Compare March 10, 2019 12:50

dotlambda reviewed Mar 11, 2019

View reviewed changes

dotlambda requested changes Mar 11, 2019

View reviewed changes

dotlambda mentioned this pull request Mar 11, 2019

pythonPackages.weasyprint: init at 45 #57377

Merged

10 tasks

Ma27 force-pushed the fix/cairocffi branch from 65d3713 to dff320d Compare March 11, 2019 22:18

GrahamcOfBorg added 10.rebuild-darwin: 11-100 and removed 10.rebuild-darwin: 1-10 labels Mar 11, 2019

Ma27 and others added 3 commits March 13, 2019 11:36

python3Packages.qasm2image: require Python 3.5 at least

16c2c6b

According to `setup.py` in 0.8 older Python wouldn't work.

pythonPackages.cairocffi: support 1.0 and 0.9

e878fd6

This patch ensures that Python2 can be used if cairocffi is used. Version 1.0 dropped Python 2 support.

dotlambda force-pushed the fix/cairocffi branch from dff320d to e878fd6 Compare March 13, 2019 10:39

dotlambda approved these changes Mar 13, 2019

View reviewed changes

python3.pkgs.cairosvg: 2.2.1 -> 2.3.0

01cb9b0

dotlambda merged commit b8f0c18 into NixOS:master Mar 13, 2019

dotlambda mentioned this pull request Mar 18, 2019

python.pkgs.cairocffi: make withXcffib work again #57855

Merged

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix cairocffi build #56839

Fix cairocffi build #56839

avnik commented Mar 4, 2019

FRidh commented Mar 5, 2019

avnik commented Mar 5, 2019 via email

FRidh commented Mar 5, 2019

avnik commented Mar 5, 2019 via email

Ma27 commented Mar 7, 2019

avnik commented Mar 7, 2019

Ma27 commented Mar 7, 2019

avnik commented Mar 7, 2019 via email

Ma27 commented Mar 9, 2019

avnik commented Mar 9, 2019 via email

Ma27 commented Mar 9, 2019

Ma27 commented Mar 10, 2019 •

edited

dotlambda Mar 11, 2019

Ma27 Mar 11, 2019

dotlambda Mar 11, 2019

dotlambda left a comment

dotlambda commented Mar 13, 2019

kamilchm commented Mar 18, 2019 •

edited

dotlambda commented Mar 18, 2019

-  inherit (callPackage ../development/python-modules/cairocffi {}) cairocffi cairocffi_0_9;
+  cairocffi = if isPy3k then
+    (callPackage ../development/python-modules/cairocffi {}).cairocffi
+  else
+    (callPackage ../development/python-modules/cairocffi {}).cairocffi_0_9;

Fix cairocffi build #56839

Fix cairocffi build #56839

Conversation

avnik commented Mar 4, 2019

Motivation for this change

Things done

FRidh commented Mar 5, 2019

avnik commented Mar 5, 2019 via email

FRidh commented Mar 5, 2019

avnik commented Mar 5, 2019 via email

Ma27 commented Mar 7, 2019

avnik commented Mar 7, 2019

Ma27 commented Mar 7, 2019

avnik commented Mar 7, 2019 via email

Ma27 commented Mar 9, 2019

avnik commented Mar 9, 2019 via email

Ma27 commented Mar 9, 2019

Ma27 commented Mar 10, 2019 • edited

dotlambda Mar 11, 2019

Choose a reason for hiding this comment

Ma27 Mar 11, 2019

Choose a reason for hiding this comment

dotlambda Mar 11, 2019

Choose a reason for hiding this comment

dotlambda left a comment

Choose a reason for hiding this comment

dotlambda commented Mar 13, 2019

kamilchm commented Mar 18, 2019 • edited

dotlambda commented Mar 18, 2019

Ma27 commented Mar 10, 2019 •

edited

kamilchm commented Mar 18, 2019 •

edited