public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python3Packages.flit: 2.3.0 -> 3.0.0

Browse Source
This commit is contained in:
Frederik Rietdijk 2020-11-29 15:04:28 +01:00
parent 4b03636646
commit 0949dfcaa3
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/python-modules/flit-core/default.nix
View File

@ -1,26 +1,24 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi
, flit , flit
, isPy3k , isPy3k
, pytoml , toml
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "flit-core"; pname = "flit-core";
version = "2.3.0"; version = "2.3.0";
disabled = !isPy3k; disabled = !isPy3k;
format = "pyproject"; format = "pyproject";
src = fetchPypi { inherit (flit) src patches;
inherit version;
pname = "flit_core"; preConfigure = ''
sha256 = "a50bcd8bf5785e3a7d95434244f30ba693e794c5204ac1ee908fc07c4acdbf80"; cd flit_core
}; '';
propagatedBuildInputs = [ propagatedBuildInputs = [
pytoml toml
]; ];
passthru.tests = { passthru.tests = {

24
pkgs/development/python-modules/flit/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchFromGitHub
, fetchpatch
, isPy3k , isPy3k
, docutils , docutils
, requests , requests
@ -10,7 +11,6 @@
, pytest , pytest
, testpath , testpath
, responses , responses
, pytoml
, flit-core , flit-core
}: }:
@ -21,19 +21,29 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "flit"; pname = "flit";
version = "2.3.0"; version = "3.0.0";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "takluyver";
sha256 = "017012b809ec489918afd68af7a70bd7c8c770c87b60159d875c126866e97a4b"; repo = "flit";
rev = version;
sha256 = "zk6mozS3Q9U43PQe/DxgwwsBRJ6Qwb+rSUVGXHijD+g=";
}; };
# Use toml instead of pytoml
# Resolves infinite recursion since packaging started using flit.
patches = [
(fetchpatch {
url = "https://github.com/takluyver/flit/commit/b81b1da55ef0f2768413669725d2874fcb0c29fb.patch";
sha256 = "11oNaYsm00/j2046V9C0idpSeG7TpY3JtLuxX3ZL/OI=";
})
];
propagatedBuildInputs = [ propagatedBuildInputs = [
docutils docutils
requests requests
requests_download requests_download
pytoml
flit-core flit-core
] ++ lib.optionals (pythonOlder "3.6") [ ] ++ lib.optionals (pythonOlder "3.6") [
zipfile36 zipfile36