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: e0470e11c7a0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7c85d7db722b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 3, 2020

  1. pythonPackages.svgwrite: refactor fix broken build 

    There was a single test in the build that tries to download a google
font.

(cherry picked from commit 6e02629)
    @costrouc
    costrouc authored and Jonathan Ringer committed Jan 3, 2020
    Copy the full SHA
    7c85d7d View commit details
Showing with 17 additions and 12 deletions.
  1. +17 −12 pkgs/development/python-modules/svgwrite/default.nix
29 changes: 17 additions & 12 deletions pkgs/development/python-modules/svgwrite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ stdenv
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, fetchFromGitHub
, pyparsing
, pytest
}:
@@ -10,21 +9,27 @@ buildPythonPackage rec {
pname = "svgwrite";
version = "1.3.1";

src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "11e47749b159ed7004721e11d380b4642a26154b8cb2f7b0102fea9c71a3dfa1";
src = fetchFromGitHub {
owner = "mozman";
repo = "svgwrite";
rev = "v${version}";
sha256 = "14wz0y118a5wwfzin6cirr9254p4y825lnrnackihdbpw22gcw11";
};

buildInputs = [ setuptools ];
propagatedBuildInputs = [ pyparsing ];
checkInputs = [ pytest ];
propagatedBuildInputs = [
pyparsing
];

checkPhase = ''
checkInputs = [
pytest
];

# embed_google_web_font test tried to pull font from internet
checkPhase = ''
pytest -k "not test_embed_google_web_font"
'';

meta = with stdenv.lib; {
meta = with lib; {
description = "A Python library to create SVG drawings";
homepage = https://github.com/mozman/svgwrite;
license = licenses.mit;