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,42 @@
{ lib, stdenv, fetchurl, autoreconfHook
, libuuid, zlib }:
let
generic = version: sha256: stdenv.mkDerivation {
pname = "xapian";
inherit version;
passthru = { inherit version; };
src = fetchurl {
url = "https://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
inherit sha256;
};
outputs = [ "out" "man" "doc" ];
buildInputs = [ libuuid zlib ];
nativeBuildInputs = [ autoreconfHook ];
doCheck = true;
AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git
patches = lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ];
# the configure script thinks that Darwin has ___exp10
# but its not available on my systems (or hydra apparently)
postConfigure = lib.optionalString stdenv.isDarwin ''
substituteInPlace config.h \
--replace "#define HAVE___EXP10 1" "#undef HAVE___EXP10"
'';
meta = with lib; {
description = "Search engine library";
homepage = "https://xapian.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
};
in {
xapian_1_4 = generic "1.4.19" "sha256-H8pI/KbMNSbMS6k90ZT+nBMmhXt47c+zfmjQhtcUqcM=";
}

View file

@ -0,0 +1,33 @@
diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc
--- xapian-core.old/tests/api_db.cc
+++ xapian-core.new/tests/api_db.cc
@@ -1020,6 +1020,7 @@
// test for keepalives
DEFINE_TESTCASE(keepalive1, remote) {
+ SKIP_TEST("Fails in darwin nix build environment");
Xapian::Database db(get_remote_database("apitest_simpledata", 5000));
/* Test that keep-alives work */
diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc
--- xapian-core.old/tests/api_scalability.cc
+++ xapian-core.new/tests/api_scalability.cc
@@ -53,6 +53,7 @@
}
DEFINE_TESTCASE(bigoaddvalue1, writable) {
+ SKIP_TEST("Fails in darwin nix build environment");
// O(n*n) is bad, but O(n*log(n)) is acceptable.
test_scalability(bigoaddvalue1_helper, 5000, O_N_LOG_N);
return true;
diff -Naur xapian-core.old/tests/api_serialise.cc xapian-core.new/tests/api_serialise.cc
--- xapian-core.old/tests/api_serialise.cc
+++ xapian-core.new/tests/api_serialise.cc
@@ -110,6 +110,7 @@
// Test for serialising a document obtained from a database.
DEFINE_TESTCASE(serialise_document2, writable) {
+ SKIP_TEST("Fails in darwin nix build environment");
Xapian::Document origdoc;
origdoc.add_term("foo", 2);
origdoc.add_posting("foo", 10);

View file

@ -0,0 +1,21 @@
{ lib, stdenv, fetchurl, pkg-config, xapian, perl, pcre, zlib, libmagic }:
stdenv.mkDerivation rec {
pname = "xapian-omega";
inherit (xapian) version;
src = fetchurl {
url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
sha256 = "0zji8ckp4h5xdy2wbir3lvk680w1g1l4h5swmaxsx7ah12lkrjcr";
};
buildInputs = [ xapian perl pcre zlib libmagic ];
nativeBuildInputs = [ pkg-config ];
meta = with lib; {
description = "Indexer and CGI search front-end built on Xapian library";
homepage = "https://xapian.org/";
license = licenses.gpl2Plus;
platforms = platforms.unix;
};
}