Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a14ea3aeccc8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0a22509d12de
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 5, 2021

  1. python3Packages.pygal: unbreak with latest pytest

    @rmcgibbo
    rmcgibbo committed Jan 5, 2021
    Copy the full SHA
    ad63d36 View commit details

  2. Merge pull request #108488 from rmcgibbo/pygal 

    python3Packages.pygal: unbreak with latest pytest
    @mweinelt
    mweinelt authored Jan 5, 2021
    Copy the full SHA
    0a22509 View commit details
Showing with 10 additions and 1 deletion.
  1. +10 −1 pkgs/development/python-modules/pygal/default.nix
11 changes: 10 additions & 1 deletion pkgs/development/python-modules/pygal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, fetchpatch
, isPyPy
, flask
, pyquery
@@ -16,12 +17,20 @@ buildPythonPackage rec {
pname = "pygal";
version = "2.4.0";

doCheck = !isPyPy; # one check fails with pypy
doCheck = !isPyPy; # one check fails with pypy

src = fetchPypi {
inherit pname version;
sha256 = "9204f05380b02a8a32f9bf99d310b51aa2a932cba5b369f7a4dc3705f0a4ce83";
};
patches = [
# Fixes compatibility with latest pytest. October 12, 2020.
# Should be included in the next release after 2.4.0
(fetchpatch {
url = "https://github.com/Kozea/pygal/commit/19e5399be18a054b3b293f4a8a2777d2df4f9c18.patch";
sha256 = "1j0hpcvd2mhi449wmlr0ml9gw4cakqk3av1j79bi2qy86dyrss2l";
})
];

buildInputs = [
flask