diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/python-modules/nwdiag | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/nwdiag')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/nwdiag/default.nix | 47 |
1 files changed, 37 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix b/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix index c8147d9d9a4e..4579be5c3c13 100644 --- a/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix @@ -1,22 +1,49 @@ -{ lib, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils -, blockdiag, setuptools +{ lib +, blockdiag +, fetchFromGitHub +, buildPythonPackage +, nose +, pytestCheckHook +, setuptools +, pythonOlder }: buildPythonPackage rec { pname = "nwdiag"; - version = "2.0.0"; + version = "3.0.0"; + format = "setuptools"; - src = fetchurl { - url = "mirror://pypi/n/nwdiag/${pname}-${version}.tar.gz"; - sha256 = "1qkl1lq7cblr6fra2rjw3zlcccragp8384hpm4n7dkc5c3yzmmsw"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "blockdiag"; + repo = pname; + rev = version; + sha256 = "sha256-uKrdkXpL5YBr953sRsHknYg+2/WwrZmyDf8BMA2+0tU="; }; - buildInputs = [ pep8 nose unittest2 docutils ]; + propagatedBuildInputs = [ + blockdiag + setuptools + ]; + + checkInputs = [ + nose + pytestCheckHook + ]; + + pytestFlagsArray = [ + "src/nwdiag/tests/" + ]; - propagatedBuildInputs = [ blockdiag setuptools ]; + disabledTests = [ + # UnicodeEncodeError: 'latin-1' codec can't encode... + "test_setup_inline_svg_is_true_with_multibytes" + ]; - # tests fail - doCheck = false; + pythonImportsCheck = [ + "nwdiag" + ]; meta = with lib; { description = "Generate network-diagram image from spec-text file (similar to Graphviz)"; |