Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
bc45bc6d10
|
|
@ -92,7 +92,7 @@ in
|
|||
};
|
||||
};
|
||||
});
|
||||
networks."40-${i.name}" = mkMerge [ (genericNetwork mkDefault) {
|
||||
networks."40-${i.name}" = mkMerge [ (genericNetwork id) {
|
||||
name = mkDefault i.name;
|
||||
DHCP = mkForce (dhcpStr
|
||||
(if i.useDHCP != null then i.useDHCP else false));
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ fetchurl, lib, stdenv }:
|
||||
|
||||
let
|
||||
version = "0.24.5";
|
||||
version = "0.25.2";
|
||||
|
||||
suffix = {
|
||||
x86_64-linux = "x86_64";
|
||||
|
|
@ -22,15 +22,15 @@ stdenv.mkDerivation {
|
|||
|
||||
sourceRoot = ".";
|
||||
src = dlbin {
|
||||
x86_64-linux = "sha256-drcm2kz2csuJqr8Oqs0r1BrxgPHOyuwC2S+99MhbMjA=";
|
||||
aarch64-linux = "sha256-x8RoBmgY3HRUOLw8YzEwQfQuT83zGfBHHWu88b4i05o=";
|
||||
x86_64-linux = "sha256-ZzlPq+Q9XfWQJr+7nKS0e6bfKwYNfpMHSiBIKeOr/s4=";
|
||||
aarch64-linux = "sha256-75UC+HeVUfUk1HRvTJsOHbHHkgr6me1OtxDF7lahf68=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
buildPhase = ''
|
||||
mv release-v${version}/firecracker-v${version}-${suffix} firecracker
|
||||
mv release-v${version}/jailer-v${version}-${suffix} jailer
|
||||
mv release-v${version}-${suffix}/firecracker-v${version}-${suffix} firecracker
|
||||
mv release-v${version}-${suffix}/jailer-v${version}-${suffix} jailer
|
||||
chmod +x firecracker jailer
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ let
|
|||
};
|
||||
|
||||
installPhase = ''
|
||||
install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/Variable/OTC/*.otf.ttc
|
||||
install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/OTC/*.ttc
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgsf";
|
||||
version = "1.14.47";
|
||||
version = "1.14.48";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i";
|
||||
sha256 = "/4bX8dRt0Ovvt72DCnSkHbZDYrmHv4hT//arTBEyuDc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config intltool libintl ];
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ assert enableGeoLocation -> geoclue2 != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webkitgtk";
|
||||
version = "2.34.3";
|
||||
version = "2.34.4";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-DS83qjLiGjbk3Vpc565c4nQ1wp1oA7liuMkMsMxJxS0=";
|
||||
sha256 = "sha256-l19QGRmbp2mRkYNc914BoYuU47zQEH2nOJ1N3LGrpAY=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
|
|
|
|||
|
|
@ -1,10 +1,23 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy27, pythonAtLeast
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, atpublic
|
||||
, cached-property
|
||||
, clickhouse-driver
|
||||
, click
|
||||
, dask
|
||||
, graphviz
|
||||
, importlib-metadata
|
||||
, multipledispatch
|
||||
, numpy
|
||||
, pandas
|
||||
, parsy
|
||||
, pyarrow
|
||||
, pytest
|
||||
, pytest-mock
|
||||
, pytest-xdist
|
||||
, pytz
|
||||
, regex
|
||||
, requests
|
||||
|
|
@ -12,54 +25,117 @@
|
|||
, tables
|
||||
, toolz
|
||||
}:
|
||||
let
|
||||
# ignore tests for which dependencies are not available
|
||||
backends = [
|
||||
"csv"
|
||||
"dask"
|
||||
"hdf5"
|
||||
"pandas"
|
||||
"parquet"
|
||||
"sqlite"
|
||||
];
|
||||
|
||||
backendsString = lib.concatStringsSep " " backends;
|
||||
|
||||
ibisTestingData = fetchFromGitHub {
|
||||
owner = "ibis-project";
|
||||
repo = "testing-data";
|
||||
rev = "743201a35c6b968cf55b054f9d28949ea15d1f0a";
|
||||
sha256 = "sha256-xuSE6wHP3aF8lnEE2SuFbTRBu49ecRmc1F3HPcszptI=";
|
||||
};
|
||||
in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ibis-framework";
|
||||
version = "1.3.0";
|
||||
disabled = isPy27 || pythonAtLeast "3.8";
|
||||
version = "2.1.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1my94a11jzg1hv6ln8wxklbqrg6z5l2l77vr89aq0829yyxacmv7";
|
||||
src = fetchFromGitHub {
|
||||
repo = "ibis";
|
||||
owner = "ibis-project";
|
||||
rev = version;
|
||||
sha256 = "sha256-n3fR6wvcSfIo7760seB+5SxtoYSqQmqkzZ9VlNQF200=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix tests for pandas 1.1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ibis-project/ibis/commit/53ef3cefc4ae90d61f3612310cb36da2bcd11305.diff";
|
||||
sha256 = "1i5yjmqridjqpggiinsjaz5spcxca5bd48vy7a0mj4mm1b5flw2m";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
atpublic
|
||||
cached-property
|
||||
clickhouse-driver
|
||||
dask
|
||||
graphviz
|
||||
multipledispatch
|
||||
numpy
|
||||
pandas
|
||||
parsy
|
||||
pyarrow
|
||||
pytz
|
||||
regex
|
||||
toolz
|
||||
sqlalchemy
|
||||
requests
|
||||
graphviz
|
||||
sqlalchemy
|
||||
tables
|
||||
pyarrow
|
||||
];
|
||||
toolz
|
||||
] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
click
|
||||
pytest
|
||||
pytest-mock
|
||||
pytest-xdist
|
||||
];
|
||||
|
||||
# ignore tests which require test dataset, or frameworks not available
|
||||
checkPhase = ''
|
||||
pytest ibis \
|
||||
--ignore=ibis/tests/all \
|
||||
--ignore=ibis/{sql,spark}
|
||||
# these tests are broken upstream: https://github.com/ibis-project/ibis/issues/3291
|
||||
disabledTests = [
|
||||
"test_summary_numeric"
|
||||
"test_summary_non_numeric"
|
||||
"test_batting_most_hits"
|
||||
"test_join_with_window_function"
|
||||
"test_where_long"
|
||||
"test_quantile_groupby"
|
||||
"test_summary_numeric"
|
||||
"test_summary_numeric_group_by"
|
||||
"test_summary_non_numeric"
|
||||
"test_searched_case_column"
|
||||
"test_simple_case_column"
|
||||
"test_summary_non_numeric_group_by"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--numprocesses $NIX_BUILD_CORES"
|
||||
"ibis/tests"
|
||||
"ibis/backends/tests"
|
||||
"ibis/backends/{${lib.concatStringsSep "," backends}}/tests"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
set -euo pipefail
|
||||
|
||||
export IBIS_TEST_DATA_DIRECTORY
|
||||
IBIS_TEST_DATA_DIRECTORY="$(mktemp -d)"
|
||||
|
||||
# copy the test data to a writable directory
|
||||
cp -r ${ibisTestingData}/* "$IBIS_TEST_DATA_DIRECTORY"
|
||||
|
||||
find "$IBIS_TEST_DATA_DIRECTORY" -type d -exec chmod u+rwx {} +
|
||||
find "$IBIS_TEST_DATA_DIRECTORY" -type f -exec chmod u+rw {} +
|
||||
|
||||
# load data
|
||||
for backend in ${backendsString}; do
|
||||
python ci/datamgr.py "$backend" &
|
||||
done
|
||||
|
||||
wait
|
||||
|
||||
export PYTEST_BACKENDS="${backendsString}"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "ibis" ] ++ (map (backend: "ibis.backends.${backend}") backends);
|
||||
|
||||
meta = with lib; {
|
||||
description = "Productivity-centric Python Big Data Framework";
|
||||
homepage = "https://github.com/ibis-project/ibis";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc cpcloud ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsmin";
|
||||
version = "2.2.2";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0fsmqbjvpxvff0984x7c0y8xmf49ax9mncz48b9xjx8wrnr9kpxn";
|
||||
sha256 = "c0959a121ef94542e807a674142606f7e90214a2b3d1eb17300244bbb5cc2bfc";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
autoconf automake pkg-config libtool gettext which gobject-introspection
|
||||
gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl util-linux
|
||||
gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
|
|
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
buildInputs = [
|
||||
expat libgudev libblockdev acl systemd glib libatasmart polkit
|
||||
expat libgudev libblockdev acl systemd glib libatasmart polkit util-linux
|
||||
];
|
||||
|
||||
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@ let
|
|||
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
hash = {
|
||||
x64-linux_hash = "sha256-L34dvileSSJxdhNwXC5iBChUM4r6hwncTHIBjWH20XE=";
|
||||
arm64-linux_hash = "sha256-cT0UcN9otaGbMXoxlxJosYFtWzA8lRvekdleUSaxN0E=";
|
||||
x64-osx_hash = "sha256-7a34R7PsgEzY4u7NKNR0LaVxonhhDNqjwQxEXaJbAww=";
|
||||
x64-linux_hash = "sha256-pkuq7waABHEo6gx6d3qJs4IXFu0EcrdpsQdKoMkjN3s=";
|
||||
arm64-linux_hash = "sha256-+BLyb6mygCFQfe7u/MbGbJROF7XT0wdRPi08izI6u8c=";
|
||||
x64-osx_hash = "sha256-f5EHxxXdXzj8x6BmTZCHQ9p8Sl8T0Rxe/K9FwTzbR4Q=";
|
||||
}."${arch}-${os}_hash";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "prowlarr";
|
||||
version = "0.1.9.1313";
|
||||
version = "0.1.10.1375";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub, pkg-config, pcsclite }:
|
||||
{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkg-config, pcsclite }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "keycard-cli";
|
||||
|
|
@ -26,5 +26,6 @@ buildGoPackage rec {
|
|||
homepage = "https://keycard.status.im";
|
||||
license = licenses.mpl20;
|
||||
maintainers = [ maintainers.zimbatm ];
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/keycard-cli.x86_64-darwin
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue