Skip to content
This repository was archived by the owner on Oct 7, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions requirements.nix
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ let
propagatedBuildInputs = [ ];
meta = with pkgs.stdenv.lib; {
homepage = "https://github.com/chardet/chardet";
license = licenses.lgpl3;
license = licenses.lgpl2;
description = "Universal encoding detector for Python 2 and 3";
};
};
Expand Down Expand Up @@ -223,7 +223,7 @@ let
propagatedBuildInputs = [ ];
meta = with pkgs.stdenv.lib; {
homepage = "http://docutils.sourceforge.net/";
license = "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)";
license = licenses.publicDomain;
description = "Docutils -- Python Documentation Utilities";
};
};
Expand Down Expand Up @@ -260,7 +260,7 @@ let
propagatedBuildInputs = [ ];
meta = with pkgs.stdenv.lib; {
homepage = "https://github.com/takluyver/entrypoints";
license = "UNKNOWN";
license = licenses.mit;
description = "Discover and load entry points from installed packages.";
};
};
Expand Down Expand Up @@ -359,7 +359,7 @@ let
];
meta = with pkgs.stdenv.lib; {
homepage = "https://github.com/takluyver/flit";
license = "UNKNOWN";
license = licenses.bsdOriginal;
description = "A simple packaging tool for simple packages.";
};
};
Expand Down Expand Up @@ -397,7 +397,7 @@ let
];
meta = with pkgs.stdenv.lib; {
homepage = "http://importlib-metadata.readthedocs.io/";
license = "Apache Software License";
license = licenses.asl20;
description = "Read metadata from Python packages";
};
};
Expand All @@ -415,7 +415,7 @@ let
];
meta = with pkgs.stdenv.lib; {
homepage = "https://github.com/takluyver/intreehooks";
license = "UNKNOWN";
license = licenses.mit;
description = "Load a PEP 517 backend from inside the source tree";
};
};
Expand Down Expand Up @@ -449,7 +449,7 @@ let
];
meta = with pkgs.stdenv.lib; {
homepage = "https://palletsprojects.com/p/jinja/";
license = licenses.bsd3;
license = licenses.bsdOriginal;
description = "A very fast and expressive template engine.";
};
};
Expand All @@ -465,7 +465,7 @@ let
propagatedBuildInputs = [ ];
meta = with pkgs.stdenv.lib; {
homepage = "https://palletsprojects.com/p/markupsafe/";
license = licenses.bsd3;
license = licenses.bsdOriginal;
description = "Safely add untrusted strings to HTML/XML markup.";
};
};
Expand Down Expand Up @@ -573,7 +573,7 @@ let
];
meta = with pkgs.stdenv.lib; {
homepage = "https://github.com/pypa/packaging";
license = licenses.bsdOriginal;
license = licenses.asl20;
description = "Core utilities for Python packages";
};
};
Expand Down Expand Up @@ -717,10 +717,10 @@ let
};

"pytest" = python.mkDerivation {
name = "pytest-5.2.1";
name = "pytest-5.2.2";
src = pkgs.fetchurl {
url = "https://files.pythonhosted.org/packages/3a/3b/f839b8431582e0f4e5f98230300db70b795f467503b2cdb0bf7eb9b18351/pytest-5.2.1.tar.gz";
sha256 = "ca563435f4941d0cb34767301c27bc65c510cb82e90b9ecf9cb52dc2c63caaa0";
url = "https://files.pythonhosted.org/packages/24/67/051f7622814613980a03c9722233a4d7f8b0e21787a46b41a1057c903992/pytest-5.2.2.tar.gz";
sha256 = "27abc3fef618a01bebb1f0d6d303d2816a99aa87a5968ebc32fe971be91eb1e6";
};
doCheck = commonDoCheck;
buildInputs = commonBuildInputs ++ [
Expand Down Expand Up @@ -759,7 +759,7 @@ let
];
meta = with pkgs.stdenv.lib; {
homepage = "https://github.com/pytest-dev/pytest-cov";
license = licenses.mit;
license = licenses.bsdOriginal;
description = "Pytest plugin for measuring coverage.";
};
};
Expand All @@ -779,7 +779,7 @@ let
propagatedBuildInputs = [ ];
meta = with pkgs.stdenv.lib; {
homepage = "https://github.com/pytest-dev/pytest-runner/";
license = "UNKNOWN";
license = licenses.mit;
description = "Invoke py.test as distutils command with dependency resolution";
};
};
Expand Down Expand Up @@ -832,7 +832,7 @@ let
propagatedBuildInputs = [ ];
meta = with pkgs.stdenv.lib; {
homepage = "https://github.com/pypa/setuptools";
license = "UNKNOWN";
license = licenses.mit;
description = "Easily download, build, install, upgrade, and uninstall Python packages";
};
};
Expand Down Expand Up @@ -912,7 +912,7 @@ let
propagatedBuildInputs = [ ];
meta = with pkgs.stdenv.lib; {
homepage = "https://github.com/python/typing/blob/master/typing_extensions/README.rst";
license = "PSF";
license = licenses.psfl;
description = "Backported and Experimental Type Hints for Python 3.5+";
};
};
Expand Down Expand Up @@ -998,7 +998,7 @@ let
];
meta = with pkgs.stdenv.lib; {
homepage = "https://github.com/jaraco/zipp";
license = "UNKNOWN";
license = licenses.mit;
description = "Backport of pathlib-compatible object wrapper for zip files";
};
};
Expand Down
2 changes: 1 addition & 1 deletion requirements_frozen.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pycodestyle==2.5.0
pyflakes==2.1.1
Pygments==2.4.2
pyparsing==2.4.2
pytest==5.2.1
pytest==5.2.2
pytest-cov==2.8.1
pytest-runner==5.1
pytoml==0.1.21
Expand Down
1 change: 0 additions & 1 deletion src/pypi2nix/wheel.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ def from_wheel_directory_path(
metadata_file, "r", encoding="ascii", errors="surrogateescape"
) as headers:
metadata = email.parser.Parser().parse(headers)
print(metadata)
license_string = str_from_message(metadata, "license")
if license_string is None:
license_string = ""
Expand Down