uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,44 @@
{ lib, fetchurl, buildPythonPackage, python, isPyPy, sip-module ? "sip" }:
buildPythonPackage rec {
pname = sip-module;
version = "4.19.25";
format = "other";
disabled = isPyPy;
src = fetchurl {
url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz";
sha256 = "04a23cgsnx150xq86w1z44b6vr2zyazysy9mqax0fy346zlr77dk";
};
configurePhase = ''
${python.executable} ./configure.py \
--sip-module ${sip-module} \
-d $out/${python.sitePackages} \
-b $out/bin -e $out/include
'';
enableParallelBuilding = true;
installCheckPhase = let
modules = [
sip-module
"sipconfig"
];
imports = lib.concatMapStrings (module: "import ${module};") modules;
in ''
echo "Checking whether modules can be imported..."
PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ${python.interpreter} -c "${imports}"
'';
doCheck = true;
meta = with lib; {
description = "Creates C++ bindings for Python modules";
homepage = "https://riverbankcomputing.com/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ lovek323 sander ];
platforms = platforms.all;
};
}

View file

@ -0,0 +1,47 @@
{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, toml }:
buildPythonPackage rec {
pname = "sip";
version = "6.5.1";
src = fetchPypi {
pname = "sip";
inherit version;
sha256 = "sha256-IE8CQNuJmadJ1jiph7NRhhhD5pI5uBHsPRiBQSw3BqY=";
};
patches = [
# on non-x86 Linux platforms, sip incorrectly detects the manylinux version
# and PIP will refuse to install the resulting wheel.
# remove once upstream fixes this, hopefully in 6.5.2
./fix-manylinux-version.patch
];
propagatedBuildInputs = [ packaging toml ];
# There aren't tests
doCheck = false;
pythonImportsCheck = [ "sipbuild" ];
# FIXME: Why isn't this detected automatically?
# Needs to be specified in pyproject.toml, e.g.:
# [tool.sip.bindings.MODULE]
# tags = [PLATFORM_TAG]
platform_tag =
if stdenv.targetPlatform.isLinux then
"WS_X11"
else if stdenv.targetPlatform.isDarwin then
"WS_MACX"
else if stdenv.targetPlatform.isWindows then
"WS_WIN"
else
throw "unsupported platform";
meta = with lib; {
description = "Creates C++ bindings for Python modules";
homepage = "https://riverbankcomputing.com/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ ];
};
}

View file

@ -0,0 +1,19 @@
diff --git a/sipbuild/project.py b/sipbuild/project.py
--- a/sipbuild/project.py
+++ b/sipbuild/project.py
@@ -336,13 +336,13 @@ class Project(AbstractProject, Configurable):
# We expect a two part tag so leave anything else unchanged.
parts = platform_tag.split('-')
if len(parts) == 2:
- if self.minimum_glibc_version > (2, 17):
+ if self.minimum_glibc_version > (2, 17) or parts[1] not in {"x86_64", "i686", "aarch64", "armv7l", "ppc64", "ppc64le", "s390x"}:
# PEP 600.
parts[0] = 'manylinux'
parts.insert(1,
'{}.{}'.format(self.minimum_glibc_version[0],
self.minimum_glibc_version[1]))
- elif self.minimum_glibc_version > (2, 12):
+ elif self.minimum_glibc_version > (2, 12) or parts[1] not in {"x86_64", "i686"}:
# PEP 599.
parts[0] = 'manylinux2014'
elif self.minimum_glibc_version > (2, 5):