git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108088 from lukeadams/pycapnp-fixes
commit454329cfc8ebbb80fd4b6fc550eb7bdcd49c35e0 authorSandro <sandro.jaeckel@gmail.com> dateWed 6 Jan 2021, 02:09 (6 years ago) parentbc7013f6c9f17e
3 files changed+24−24
pkgs/development/python-modules/pkgconfig/default.nix+7−8 pkgs/development/python-modules/pycapnp/default.nix+16−15 pkgs/top-level/python-packages.nix+1−1
pkgs/development/python-modules/pkgconfig/default.nix+7−8
@@ -1,10 +1,10 @@
1−{ lib, buildPythonPackage, fetchPypi, nose, pkgconfig }:
1+{ lib, buildPythonPackage, fetchPypi, pkg-config }:
22
33buildPythonPackage rec {
44 pname = "pkgconfig";
55 version = "1.5.1";
66
7− inherit (pkgconfig)
7+ inherit (pkg-config)
88 setupHooks
99 wrapperName
1010 suffixSalt
@@ -17,19 +17,18 @@ buildPythonPackage rec {
1717 sha256 = "97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f";
1818 };
1919
20− checkInputs = [ nose ];
2120
22− nativeBuildInputs = [ pkgconfig ];
21+ propagatedNativeBuildInputs = [ pkg-config ];
2322
24− checkPhase = ''
25− nosetests
26− '';
23+ doCheck = false;
2724
2825 patches = [ ./executable.patch ];
2926 postPatch = ''
30− substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config"'
27+ substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"'
3128 '';
3229
30+ pythonImportsCheck = [ "pkgconfig" ];
31+
3332 meta = with lib; {
3433 description = "Interface Python with pkg-config";
3534 homepage = "https://github.com/matze/pkgconfig";
pkgs/development/python-modules/pycapnp/default.nix+16−15
@@ -1,34 +1,35 @@
11{ stdenv
22, buildPythonPackage
3−, fetchPypi
43, capnproto
54, cython
5+, fetchFromGitHub
6+, isPy27
67, isPyPy
7−, isPy3k
8+, pkgconfig
89}:
910
1011buildPythonPackage rec {
1112 pname = "pycapnp";
1213 version = "1.0.0";
13− disabled = isPyPy || isPy3k;
14+ disabled = isPyPy || isPy27;
1415
15− src = fetchPypi {
16− inherit pname version;
17− sha256 = "9f6fcca349ebf2ec04ca7eacb076aea3e4fcdc010ac33c98b54f0a19d4e5d3e0";
16+ src = fetchFromGitHub {
17+ owner = "capnproto";
18+ repo = pname;
19+ rev = "v${version}";
20+ sha256 = "1n6dq2fbagi3wvrpkyb7wx4y15nkm2grln4y75hrqgmnli8ggi9v";
1821 };
1922
20− buildInputs = [ capnproto cython ];
23+ buildInputs = [ capnproto cython pkgconfig ];
2124
22− # import setuptools as soon as possible, to minimize monkeypatching mayhem.
23− postConfigure = ''
24− sed -i '3iimport setuptools' setup.py
25− '';
25+ # Tests disabled due to dependency on jinja and various other libraries.
26+ doCheck = false;
27+
28+ pythonImportsCheck = [ "capnp" ];
2629
2730 meta = with stdenv.lib; {
28− maintainers = with maintainers; [ cstrahan ];
31+ maintainers = with maintainers; [ cstrahan lukeadams ];
2932 license = licenses.bsd2;
30− homepage = "http://jparyani.github.io/pycapnp/index.html";
31− broken = true; # 2018-04-11
33+ homepage = "https://capnproto.github.io/pycapnp/";
3234 };
33−
3435}
pkgs/top-level/python-packages.nix+1−1
@@ -4719,7 +4719,7 @@ in {
47194719 inherit (pkgs.libsForQt5) soqt;
47204720 };
47214721
4722− pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; };
4722+ pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkg-config; };
47234723
47244724 pkginfo = callPackage ../development/python-modules/pkginfo { };
47254725