Commit graph

36 commits

Author SHA1 Message Date
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Jan Tojnar 17739fa570
python3.pkgs.pycairo: clean up
* drop unneeded xlibs dependency
* correct license
* do not use pkgconfig alias
* use pytestCheckHook
* format
2020-10-20 00:07:26 +02:00
Pavol Rusnak 420124adf8 python: remove isPy33, isPy34 2020-05-04 18:49:45 -07:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jonathan Ringer 925f19a502
python3Packages.pycairo: 1.18.1 -> 1.18.2 2019-11-05 09:40:25 -08:00
worldofpeace 6be3f7f5ca pythonPackages.pycairo: 1.18.0 -> 1.18.1
https://pycairo.readthedocs.io/en/latest/changelog.html#v1-18-1
2019-04-24 11:17:41 -04:00
worldofpeace 986650d0c2 pythonPackages.pycairo: 1.16.3 -> 1.18.0
Changelog: https://pycairo.readthedocs.io/en/latest/changelog.html
2019-01-10 22:06:51 -05:00
Jan Tojnar 8bf523e17c
python.pkgs.pycairo: 1.15.4 → 1.16.3 2018-04-12 11:53:48 +02:00
Jan Tojnar a63603685a
pythonPackages.pycairo: 1.10.0 → 1.15.4 2017-11-27 19:48:19 +01:00
John Ericson 531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Vladimír Čunát d12497a23b
pycairo: fix #26475 - another dead patch download 2017-06-09 21:57:35 +02:00
Vladimír Čunát 97f3009bf8
pycairo: fix #26475 - a dead patch download 2017-06-09 15:21:25 +02:00
Frederik Rietdijk 959842a9c7 Python: add pname attributes to libraries
so that we can use the update script.
2017-05-27 11:30:21 +02:00
Vaibhav Sagar d9b36c36c5 pycairo: fix build with Python 3.6
Apply the same patch as for Python 3.5 so that this builds correctly.
Addresses #24501.
2017-04-01 09:58:01 +02:00
Frederik Rietdijk 3760c8c7fd Python: replace mkPythonDerivation with buildPythonPackage and format="other";
This way all Python packages use the same function,
`buildPythonPackage`.
2017-03-21 13:01:49 +01:00
Frederik Rietdijk 879a98bf27 pythonPackages.pycairo: fix name 2016-12-10 14:38:09 +01:00
Frederik Rietdijk ec6f049c09 pythonPackages.pycairo: python.is_py3k was removed 2016-10-18 23:14:36 +02:00
Frederik Rietdijk 4f6b6f1472 pythonPackages: use mkPythonDerivation 2016-09-01 16:16:31 +02:00
Alexander Ried cf82611351
pycairo: enable for python35
The patch was taken from FreeBSD, it is also used on debian. see:
https://svnweb.freebsd.org/ports/head/graphics/py3-cairo/files/pycairo-1.10.0-waf-py3_5.patch?revision=401900&view=markup
2016-04-29 02:32:03 +02:00
Vincent Laporte c67c27dc82 pycairo: add darwin to meta.platforms 2016-01-28 11:02:26 +01:00
Frederik Rietdijk 1d84bff14c python pycairo: add python.libPrefix 2015-12-11 11:28:31 +01:00
Domen Kožar 792fcd9f70 pycairo: disable on py35 2015-11-08 08:22:04 +01:00
Vladimír Čunát 21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Pascal Wittmann cb8f111a72 Revert "pycairo: set user-agent to fix download of patches"
This commit was should fix issue #7586, but it does not.

This reverts commit e1c65ddfe1.
2015-04-28 22:23:21 +02:00
Pascal Wittmann e1c65ddfe1 pycairo: set user-agent to fix download of patches 2015-04-28 09:51:26 +02:00
Domen Kožar 9214859fd2 Revert "Mark many packages (mostly python) broken because of broken dependencies."
This reverts commit bf86758a42.

See 71a9aa10ca25f5659a657d8910e11f36c3439a36
2015-02-25 09:23:31 +01:00
Peter Simons bf86758a42 Mark many packages (mostly python) broken because of broken dependencies. 2015-02-23 14:06:24 +01:00
Domen Kožar 33ce850b82 fix a bunch of packages with lua5_1 2014-09-10 17:24:56 +02:00
Vladimír Čunát e470391988 pycairo: fix for python-3.4 by LFS patches
Fixes #2693.
2014-05-20 12:44:09 +02:00
Linquize afaee01ed3 pycairo: Update to 1.10.0 and support both python 2 and python 3
Close #1802.
2014-02-22 16:59:24 +01:00
Florian Friesdorf 87423443b8 pycairo: move to pythonPackages 2013-01-11 15:23:44 +01:00
Eelco Dolstra e2a374799f * Reverted most of the recent Python refactorings, as discussed. It's
a worthy goal to move the Python packages that are currently in
  all-packages.nix into a single attribute set, but this doesn't
  require moving python-packages.nix or the other changes made to that
  file.  The Python packages in all-packages.nix should simply be
  moved to python-packages.nix, and ideally changed to use
  buildPythonPackage.

svn path=/nixpkgs/trunk/; revision=21196
2010-04-21 10:51:15 +00:00
Marc Weber 8c0b7e4ad2 - adding experimental python31 build
- cleanup python libraries:
 * moving all python libraries into a attr set into a directory
   so that expressions can be used for both: python 2.5 and 2.6 easily
 * disabling packages which don't build

svn path=/nixpkgs/trunk/; revision=21142
2010-04-17 18:28:25 +00:00
Lluís Batlle i Rossell 788e40bd5a Updating some py-gtk things.
With a newer glib, I could have used a newer pyobject.

svn path=/nixpkgs/trunk/; revision=20962
2010-04-06 19:39:25 +00:00
Armijn Hemel 4d0fe8a249 add pycairo: cairo bindings for cairo
svn path=/nixpkgs/trunk/; revision=8666
2007-05-13 20:49:13 +00:00