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: 184aacbd99a1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d5090fe57c9e
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 5, 2018

  1. pythonPackages.svgwrite: 1.1.6 -> 1.2.1

    @marsam
    marsam committed Dec 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    costrouc Christopher Ostrouchov
    GPG key ID: 9ED59B0AB1EAF573
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e8bfc31 View commit details

  2. pythonPackages.CairoSVG: 2.1.3 -> 2.2.1

    @marsam
    marsam committed Dec 5, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c564ca8 View commit details

  3. pythonPackages.qasm2image: fix build

    @marsam
    marsam committed Dec 5, 2018
    Copy the full SHA
    e728f2d View commit details

  4. Merge pull request #51542 from marsam/feature/update-python-svgwrite 

    pythonPackages.svgwrite: 1.1.6 -> 1.2.1
    @rasendubi
    rasendubi authored Dec 5, 2018
    Copy the full SHA
    d5090fe View commit details
16 changes: 13 additions & 3 deletions pkgs/development/python-modules/cairosvg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, fetchpatch
, cairocffi, cssselect2, defusedxml, pillow, tinycss2
, pytestrunner, pytestcov, pytest-flake8, pytest-isort }:

buildPythonPackage rec {
pname = "CairoSVG";
version = "2.1.3";
version = "2.2.1";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "e512f555f576b6462b04b585c4ba4c09a43f3a8fec907b60ead21d7d00c550e9";
sha256 = "93c5b3204478c4e20c4baeb33807db5311b4420c21db2f21034a6deda998cb14";
};

patches = [
# Fix tests. Remove with the next release
(fetchpatch {
url = https://github.com/Kozea/CairoSVG/commit/1f403ad229f0e2782d6427a79f0fbeb6b76148b6.patch;
sha256 = "1dxpj5zh8wmx9f8pj11hrixd5jlaqq5xlcdnbl462bh29zj18l26";
})
];

LC_ALL="en_US.UTF-8";

propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];

checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort ];
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/qasm2image/default.nix
View file
Original file line number Diff line number Diff line change
@@ -36,6 +36,8 @@ buildPythonPackage rec {
${python.interpreter} tests/launch_tests.py
'';

LC_ALL="en_US.UTF-8";

meta = {
description = "A Python module to visualise quantum circuit";
homepage = https://github.com/nelimeee/qasm2image;
13 changes: 10 additions & 3 deletions pkgs/development/python-modules/svgwrite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,23 +3,30 @@
, fetchPypi
, setuptools
, pyparsing
, pytest
}:

buildPythonPackage rec {
pname = "svgwrite";
version = "1.1.6";
version = "1.2.1";

src = fetchPypi {
inherit pname version;
sha256 = "1f018813072aa4d7e95e58f133acb3f68fa7de0a0d89ec9402cc38406a0ec5b8";
extension = "zip";
sha256 = "72ef66c9fe367989823cb237ab7f012ac809dd3ba76c1b5ebd9aa61580e2e75e";
};

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

checkPhase = ''
pytest
'';

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