Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
bd1a0c9702
|
|
@ -5274,6 +5274,12 @@
|
|||
githubId = 307589;
|
||||
name = "Nathaniel Baxter";
|
||||
};
|
||||
liamdiprose = {
|
||||
email = "liam@liamdiprose.com";
|
||||
github = "liamdiprose";
|
||||
githubId = 1769386;
|
||||
name = "Liam Diprose";
|
||||
};
|
||||
liff = {
|
||||
email = "liff@iki.fi";
|
||||
github = "liff";
|
||||
|
|
|
|||
|
|
@ -16,18 +16,21 @@ in {
|
|||
'';
|
||||
};
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "cdrom";
|
||||
description = ''
|
||||
Group that users must be in to use <command>cdemu</command>.
|
||||
'';
|
||||
};
|
||||
gui = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to install the <command>cdemu</command> GUI (gCDEmu).
|
||||
'';
|
||||
};
|
||||
image-analyzer = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to install the image analyzer.
|
||||
|
|
|
|||
|
|
@ -244,7 +244,8 @@ in {
|
|||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = ''
|
||||
The full path to a file that contains the admin's password.
|
||||
The full path to a file that contains the admin's password. Must be
|
||||
readable by user <literal>nextcloud</literal>.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "openscad";
|
||||
version = "2019.05";
|
||||
version = "2021.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openscad";
|
||||
repo = "openscad";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "1qz384jqgk75zxk7sqd22ma9pyd94kh4h6a207ldx7p9rny6vc5l";
|
||||
sha256 = "sha256-2tOLqpFt5klFPxHNONnHVzBKEFWn4+ufx/MU+eYbliA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison flex pkg-config gettext qmake ];
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
"NSSHARED=${buildsystem}/share/netsurf-buildsystem"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE= "-Wno-error=implicit-fallthrough";
|
||||
NIX_CFLAGS_COMPILE= [ "-Wno-error=implicit-fallthrough" "-Wno-error=maybe-uninitialized" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.netsurf-browser.org/projects/${libname}/";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, mkDerivation
|
||||
, makeWrapper
|
||||
, fetchFromGitHub
|
||||
# Dynamic libraries
|
||||
|
|
@ -32,11 +31,11 @@
|
|||
assert pulseaudioSupport -> libpulseaudio != null;
|
||||
|
||||
let
|
||||
version = "5.4.57862.0110";
|
||||
version = "5.5.6981.0202";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
|
||||
sha256 = "sha256-ZAwXhbZ3nT6PGkSC1vnX2y/XUOZfped0r3OuedI62gY=";
|
||||
sha256 = "05alb81cn1vbpva5rcfwh58sjbg4f2pils4vcdgw6dvi4pbvs694";
|
||||
};
|
||||
};
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -1,21 +1,22 @@
|
|||
{ lib, stdenv, ncurses5, fetchFromGitHub, rustPlatform, libiconv, Security }:
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-interactive-rebase-tool";
|
||||
version = "1.2.1";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MitMaro";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "10z3di2qypgsmg2z7xfs9nlrf9vng5i7l8dvqadv1l4lb9zz7i8q";
|
||||
sha256 = "117zwxyq2vc33nbnfpjbdr5vc2l5ymf6ln1dm5551ha3y3gdq3bf";
|
||||
};
|
||||
|
||||
cargoSha256 = "0jc6mhszxmwsdjk73wkfi0jjp9vkzzl9kk0dbnry6w7dyr5if8cc";
|
||||
cargoSha256 = "051llwk9swq03xdqwyj0hlyv2ywq2f1cnks95nygyy393q7v930x";
|
||||
|
||||
buildInputs = [ ncurses5 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
cargoParallelTestThreads = false;
|
||||
# external_editor::tests::* tests fail
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/MitMaro/git-interactive-rebase-tool";
|
||||
|
|
|
|||
31
pkgs/development/python-modules/aioinflux/default.nix
Normal file
31
pkgs/development/python-modules/aioinflux/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, ciso8601
|
||||
, pandas
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioinflux";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1jy5mcg9wdz546s9wdwsgkxhm2ac4dmphd9vz243db39j1m0a3bj";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ciso8601 pandas ];
|
||||
|
||||
# Tests require InfluxDB server
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "aioinflux" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Asynchronous Python client for InfluxDB";
|
||||
homepage = "https://github.com/gusutabopb/aioinflux";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ liamdiprose lopsided98 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-api-core";
|
||||
version = "1.24.1";
|
||||
version = "1.25.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0sflnpgsvk2h1cr1m3mgxx6pzz55xw7sk4y4qdimhs5jdm2fw78g";
|
||||
sha256 = "0e152ec37b8481d1be1258d95844a5a7031cd3d83d7c7046d9e9b2d807042440";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, pytestCheckHook
|
||||
, freezegun
|
||||
, google-cloud-core
|
||||
, google-cloud-storage
|
||||
, google-cloud-testutils
|
||||
, google-resumable-media
|
||||
, grpcio
|
||||
|
|
@ -11,16 +12,17 @@
|
|||
, mock
|
||||
, pandas
|
||||
, proto-plus
|
||||
, psutil
|
||||
, pyarrow
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery";
|
||||
version = "2.6.2";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1c940bf190a681d80b6f6cd7541924ad411de5f0585b2c8c5e420ab750e2024d";
|
||||
sha256 = "29721972f5e539e486fbdc722ddf849ad86acd092680d16c271430dc16023544";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -36,6 +38,8 @@ buildPythonPackage rec {
|
|||
ipython
|
||||
mock
|
||||
pandas
|
||||
psutil
|
||||
google-cloud-storage
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
|
@ -44,6 +48,12 @@ buildPythonPackage rec {
|
|||
rm -r google
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# requires credentials
|
||||
"test_bigquery_magic"
|
||||
"TestBigQuery"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"google.cloud.bigquery"
|
||||
"google.cloud.bigquery_v2"
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dlp";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "09rnzpdlycr1wv8agcfx05v1prn35ylphsbr07486zqdkh5wjk8p";
|
||||
sha256 = "193c2c012639f0c063999e0b899f92d70763be605d5528f3d1da93d6734a1aa8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
|
|
|
|||
|
|
@ -19,6 +19,11 @@ buildPythonPackage rec {
|
|||
sha256 = "2fd6fe25343f7017c22e2733a0358c64b3171edc1669d0c8a1e1f07f86a048c4";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'google-cloud-logging>=1.14.0, <2.1' 'google-cloud-logging>=1.14.0'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ google-cloud-logging libcst proto-plus ];
|
||||
|
||||
checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-logging";
|
||||
version = "2.0.2";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0s09vs4rnq4637j8zw7grv3f4j7njqprm744b1knzldj91rg0vmi";
|
||||
sha256 = "8932ac382eee6af85cd08400a77586dd3139fbf40b61db757c4c492490899741";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];
|
||||
|
|
|
|||
|
|
@ -21,11 +21,6 @@ buildPythonPackage rec {
|
|||
sha256 = "060c53bc6f541660a2fe868fd83a695207d4e7b050e04fe103d1e77634b813c7";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"proto-plus == 1.11.0"' '"proto-plus"'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ google-cloud-core grpc_google_iam_v1 libcst proto-plus sqlparse ];
|
||||
|
||||
checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-storage";
|
||||
version = "1.35.0";
|
||||
version = "1.35.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "17kal75wmyjpva7g04cb9yg7qbyrgwfn575z4gqijd4gz2r0sp2m";
|
||||
sha256 = "dc076b6af6da991252416639cb93831f8e50c8328d5ac3fb8e03e40cd8de2290";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, pytest-asyncio
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
|
|
@ -11,22 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-httpserver";
|
||||
version = "0.3.6";
|
||||
version = "0.3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pytest_httpserver";
|
||||
inherit version;
|
||||
sha256 = "1wdhbzv6x2v4qsqwgsc5660c4lxplh9b61vfj1zqhbhs36y96vl9";
|
||||
sha256 = "sha256-YgTcrUlwh2jz0tJdMUgjm8RcqrtpJ/oUQm3SnxUc5Z4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "remove-pytest-runner.patch";
|
||||
url = "https://github.com/csernazs/pytest-httpserver/commit/c9752018bc2f13d141dd52c92df75c19ea388836.patch";
|
||||
sha256 = "0b76ywzl2gwddbqqlb662mfv5j42l88l5hffm7jbxzvqbz94mx3k";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ werkzeug ];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-snapshot";
|
||||
version = "0.4.2";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1p33fcplfykwf5mdwg25n8hjgzxpx8w1iprjnfzibpxclfrxmy5i";
|
||||
sha256 = "77d736073598a6224825eef8b8e0c760812a61410af2180cb070b27eb79f257d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.0.0";
|
||||
version = "2.1.4";
|
||||
pname = "sphinxcontrib-bibtex";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "629612b001f86784669d65e662377a482052decfd9a0a17c46860878eef7b9e0";
|
||||
sha256 = "f53ec0cd534d2c8f0a51b4b3473ced46e9cb0dd99a7c5019249fe0ef9cbef18e";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ];
|
||||
|
|
|
|||
|
|
@ -1,33 +1,43 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, matchpy
|
||||
, numpy
|
||||
, astunparse
|
||||
, typing-extensions
|
||||
, black
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pytestcov
|
||||
, numba
|
||||
, nbval
|
||||
, python
|
||||
, isPy37
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "uarray";
|
||||
version = "0.6.0";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fa63ae7034833a99bc1628d3cd5501d4d00f2e6437b6cbe73f710dcf212a6bea";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Quansight-Labs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1x2jp7w2wmn2awyv05xs0frpq0fa0rprwcxyg72wgiss0bnzxnhm";
|
||||
};
|
||||
|
||||
doCheck = false; # currently has circular dependency module import, remove when bumping to >0.5.1
|
||||
checkInputs = [ pytest nbval pytestcov numba ];
|
||||
propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions black ];
|
||||
patches = [(
|
||||
# Fixes a compile error with newer versions of GCC -- should be included
|
||||
# in the next release after 0.8.2
|
||||
fetchpatch {
|
||||
url = "https://github.com/Quansight-Labs/uarray/commit/a2012fc7bb94b3773eb402c6fe1ba1a894ea3d18.patch";
|
||||
sha256 = "1qqh407qg5dz6x766mya2bxrk0ffw5h17k478f5kcs53g4dyfc3s";
|
||||
}
|
||||
)];
|
||||
|
||||
checkInputs = [ pytestCheckHook pytestcov ];
|
||||
propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions ];
|
||||
|
||||
# Tests must be run from outside the source directory
|
||||
preCheck = ''
|
||||
cd $TMP
|
||||
'';
|
||||
pytestFlagsArray = ["--pyargs" "uarray"];
|
||||
pythonImportsCheck = [ "uarray" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pack";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildpacks";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fNPgdMwqQq2Gh/rkf6KHEd34rnQqhw7Jf1L34oVorqM=";
|
||||
sha256 = "sha256-VTQ3NOskBp7ic8a/nn/ZbALJVff+Pb/ZHHbld/OxQdo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-U38j5fxECKjYr5pqaNk0+Z0opQNqiYV2+6dIEaHUVF8=";
|
||||
vendorSha256 = "sha256-n8X2NyQiOpEQ0d/ek1kdxKFfaCFf0EucflVLZjOGMfY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ while [ "$#" -gt 0 ]; do
|
|||
j="$1"; shift 1
|
||||
extraBuildFlags+=("$i" "$j")
|
||||
;;
|
||||
--show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*|-L|--refresh|--no-net|--impure)
|
||||
--show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*|-L|--refresh|--no-net|--offline|--impure)
|
||||
extraBuildFlags+=("$i")
|
||||
;;
|
||||
--option)
|
||||
|
|
|
|||
|
|
@ -11,11 +11,15 @@
|
|||
, zlib
|
||||
}: stdenv.mkDerivation rec {
|
||||
name = "roon-server";
|
||||
version = "100700571";
|
||||
version = "100700710";
|
||||
|
||||
# N.B. The URL is unstable. I've asked for them to provide a stable URL but
|
||||
# they have ignored me. If this package fails to build for you, you may need
|
||||
# to update the version and sha256.
|
||||
# c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129
|
||||
src = fetchurl {
|
||||
url = "http://download.roonlabs.com/updates/stable/RoonServer_linuxx64_${version}.tar.bz2";
|
||||
sha256 = "191vlzf10ypkk1prp6x2rszlmsihdwpd3wvgf2jg6ckwyxy2hc6k";
|
||||
url = "https://web.archive.org/web/20210202130624/https://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2";
|
||||
sha256 = "sha256-S1c3RvN/HE8zwpGZARYRy/Gu4OTG0CjWbxJhZ3cKoVE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "atftp";
|
||||
version = "0.7.2";
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz";
|
||||
sha256 = "0hah3fhzl6vfs381883vbvf4d13cdhsyf0x7ncbl55wz9rkq1l0s";
|
||||
sha256 = "sha256-08nNDZcd/Hhtel9AVcNdTmaq/IECrANHPvIlvfftsmo=";
|
||||
};
|
||||
|
||||
buildInputs = [ readline tcp_wrappers pcre makeWrapper gcc ];
|
||||
|
|
|
|||
|
|
@ -254,6 +254,8 @@ in {
|
|||
|
||||
aioimaplib = callPackage ../development/python-modules/aioimaplib { };
|
||||
|
||||
aioinflux = callPackage ../development/python-modules/aioinflux { };
|
||||
|
||||
aiojobs = callPackage ../development/python-modules/aiojobs { };
|
||||
|
||||
aiokafka = callPackage ../development/python-modules/aiokafka { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue