ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108572 from fabaff/bump-sortedcollections

Browse Source
This commit is contained in:
Sandro 2021-01-11 01:36:33 +01:00 committed by GitHub
commit 39229a3398
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/python-modules/sortedcollections/default.nix
View File

@ -1,27 +1,31 @@
{ stdenv { stdenv
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchFromGitHub
, pytestCheckHook
, sortedcontainers , sortedcontainers
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "sortedcollections"; pname = "sortedcollections";
version = "1.2.1"; version = "1.2.3";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "grantjenks";
sha256 = "0sihzm5aqz7r3irh4jn6rzicb7lf81d27z7vl6kaslnhwcsizhsq"; repo = "python-sortedcollections";
rev = "v${version}";
sha256 = "06ifkbhkj5fpsafibw0fs7b778g7q0gd03crvbjk04k0f3wjxc5z";
}; };
propagatedBuildInputs = [ sortedcontainers ]; propagatedBuildInputs = [ sortedcontainers ];
# No tests in PyPi tarball checkInputs = [ pytestCheckHook ];
doCheck = false;
pythonImportsCheck = [ "sortedcollections" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Python Sorted Collections"; description = "Python Sorted Collections";
homepage = "http://www.grantjenks.com/docs/sortedcollections/"; homepage = "http://www.grantjenks.com/docs/sortedcollections/";
license = licenses.asl20; license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
}; };
} }

4
pkgs/tools/audio/google-music-scripts/default.nix
View File

@ -26,11 +26,11 @@ buildPythonApplication rec {
sha256 = "0apwgj86whrc077dfymvyb4qwj19bawyrx49g4kg364895v0rbbq"; sha256 = "0apwgj86whrc077dfymvyb4qwj19bawyrx49g4kg364895v0rbbq";
}; };
# pendulum pinning was to prevent PEP517 from trying to build from source # there are already later releases present
postPatch = '' postPatch = ''
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace "tomlkit>=0.5,<0.6" "tomlkit" \ --replace "tomlkit>=0.5,<0.6" "tomlkit" \
--replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum" --replace "attrs>=18.2,<19.4" "attrs"
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [