git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #110210 from SuperSandro2000/fix-collection4

Fix collection 4: substituteInPlace cleanups, pythonPackages.azure-synapse-artifacts: Fix meta

commitc4965b409a80e8b0a552d114b983c9fbee4ea55e authorSandro <sandro.jaeckel@gmail.com> dateWed 20 Jan 2021, 23:26 (6 years ago) parentfeb4059f1478a7
7 files changed+20−35
pkgs/development/python-modules/azure-synapse-artifacts/default.nix+2−2 pkgs/development/python-modules/bellows/default.nix+13−12 pkgs/development/python-modules/bidict/default.nix+2−11 pkgs/development/python-modules/google-music/default.nix−5 pkgs/development/python-modules/mxnet/default.nix+1−3 pkgs/development/python-modules/spyder/default.nix+1−2 pkgs/top-level/perl-packages.nix+1
pkgs/development/python-modules/azure-synapse-artifacts/default.nix+2−2
@@ -23,8 +23,8 @@ buildPythonPackage rec {
2323 pythonImportsCheck = [ "azure.synapse.artifacts" ];
2424
2525 meta = with lib; {
26− description = "CHANGE";
27− homepage = "https://github.com/CHANGE/azure-synapse-artifacts/";
26+ description = "Microsoft Azure Synapse Artifacts Client Library for Python";
27+ homepage = "https://github.com/Azure/azure-sdk-for-python";
2828 license = licenses.mit;
2929 maintainers = with maintainers; [ jonringer ];
3030 };
pkgs/development/python-modules/bellows/default.nix+13−12
@@ -1,26 +1,27 @@
1−{ lib, stdenv, buildPythonPackage, fetchPypi
1+{ lib, stdenv, buildPythonPackage, fetchFromGitHub
22, click, click-log, pure-pcapy3
3−, pyserial, pyserial-asyncio, voluptuous, zigpy
4−, asynctest, pytest, pytest-asyncio }:
3+, pyserial-asyncio, voluptuous, zigpy
4+, asynctest, pytestCheckHook, pytest-asyncio }:
55
6−let
6+buildPythonPackage rec {
77 pname = "bellows";
88 version = "0.21.0";
99
10−in buildPythonPackage rec {
11− inherit pname version;
12−
13− src = fetchPypi {
14− inherit pname version;
15− sha256 = "fd2ac40c1f3550580dc561ae58d7d15cfa12e6a7cc5d35ee80e7a1cb6a4cda4f";
10+ src = fetchFromGitHub {
11+ owner = "zigpy";
12+ repo = "bellows";
13+ rev = version;
14+ sha256 = "1gja7cb1cyzbi19k8awa2gyc3bjam0adapalpk5slxny0vxlc73a";
1615 };
1716
1817 propagatedBuildInputs = [
19− click click-log pure-pcapy3 pyserial pyserial-asyncio voluptuous zigpy
18+ click click-log pure-pcapy3 pyserial-asyncio voluptuous zigpy
2019 ];
2120
2221 checkInputs = [
23− asynctest pytest pytest-asyncio
22+ asynctest
23+ pytestCheckHook
24+ pytest-asyncio
2425 ];
2526
2627 prePatch = ''
pkgs/development/python-modules/bidict/default.nix+2−11
@@ -3,7 +3,7 @@
33, sphinx
44, hypothesis
55, py
6−, pytest
6+, pytestCheckHook
77, pytest-benchmark
88, sortedcollections
99, sortedcontainers
@@ -23,23 +23,14 @@ buildPythonPackage rec {
2323 nativeBuildInputs = [ setuptools_scm ];
2424 propagatedBuildInputs = [ sphinx ];
2525
26− # this can be removed >0.19.0
27− postPatch = ''
28− substituteInPlace setup.py \
29− --replace "setuptools_scm < 4" "setuptools_scm"
30− '';
31−
3226 checkInputs = [
3327 hypothesis
3428 py
35− pytest
29+ pytestCheckHook
3630 pytest-benchmark
3731 sortedcollections
3832 sortedcontainers
3933 ];
40− checkPhase = ''
41− pytest tests
42− '';
4334
4435 meta = with lib; {
4536 homepage = "https://github.com/jab/bidict";
pkgs/development/python-modules/google-music/default.nix−5
@@ -19,11 +19,6 @@ buildPythonPackage rec {
1919 sha256 = "0fsp491ifsw0i1r98l8xr41m8d00nw9n5bin8k3laqzq1p65d6dp";
2020 };
2121
22− postPatch = ''
23− substituteInPlace setup.py \
24− --replace "audio-metadata>=0.8,<0.9" "audio-metadata"
25− '';
26−
2722 propagatedBuildInputs = [
2823 appdirs
2924 audio-metadata
pkgs/development/python-modules/mxnet/default.nix+1−3
@@ -20,9 +20,7 @@ buildPythonPackage {
2020
2121 postPatch = ''
2222 substituteInPlace python/setup.py \
23− --replace "graphviz<0.9.0," "graphviz" \
24− --replace "numpy<=1.15.2," "numpy" \
25− --replace "requests<2.19.0," "requests"
23+ --replace "graphviz<0.9.0," "graphviz"
2624 '';
2725
2826 preConfigure = ''
pkgs/development/python-modules/spyder/default.nix+1−2
@@ -44,8 +44,7 @@ buildPythonPackage rec {
4444 sed -i /pyqtwebengine/d setup.py
4545 substituteInPlace setup.py \
4646 --replace "pyqt5<5.13" "pyqt5" \
47− --replace "parso==0.7.0" "parso" \
48− --replace "jedi==0.17.1" "jedi"
47+ --replace "parso==0.7.0" "parso"
4948 '';
5049
5150 postInstall = ''
pkgs/top-level/perl-packages.nix+1
@@ -19038,6 +19038,7 @@ let
1903819038 description = "lib/Safe/Hole.pm";
1903919039 license = with lib.licenses; [ artistic1 gpl1Plus ];
1904019040 homepage = "https://github.com/toddr/Safe-Hole";
19041+ broken = stdenv.isDarwin;
1904119042 };
1904219043 };
1904319044