mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-18 11:44:07 +00:00
89023c38fc
I made a mistake merge. Reverting it inc778945806undid 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 from4effe769e2) - 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
50 lines
840 B
Nix
50 lines
840 B
Nix
{ lib
|
|
, fetchFromGitHub
|
|
, meson
|
|
, ninja
|
|
, buildPythonPackage
|
|
, pytestCheckHook
|
|
, pkg-config
|
|
, cairo
|
|
, isPy3k
|
|
}:
|
|
|
|
buildPythonPackage rec {
|
|
pname = "pycairo";
|
|
version = "1.18.2";
|
|
|
|
format = "other";
|
|
|
|
src = fetchFromGitHub {
|
|
owner = "pygobject";
|
|
repo = "pycairo";
|
|
rev = "v${version}";
|
|
sha256 = "142145a2whvlk92jijrbf3i2bqrzmspwpysj0bfypw0krzi0aa6j";
|
|
};
|
|
|
|
nativeBuildInputs = [
|
|
meson
|
|
ninja
|
|
pkg-config
|
|
];
|
|
|
|
buildInputs = [
|
|
cairo
|
|
];
|
|
|
|
checkInputs = [
|
|
pytestCheckHook
|
|
];
|
|
|
|
mesonFlags = [
|
|
"-Dpython=${if isPy3k then "python3" else "python"}"
|
|
];
|
|
|
|
meta = with lib; {
|
|
description = "Python 2/3 bindings for cairo";
|
|
homepage = "https://pycairo.readthedocs.io/";
|
|
license = with licenses; [ lgpl21Only mpl11 ];
|
|
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
|
};
|
|
}
|