t Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
commit
5f377994ca
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "catch2";
|
||||
version = "2.13.8";
|
||||
version = "2.13.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catchorg";
|
||||
repo = "Catch2";
|
||||
rev = "v${version}";
|
||||
sha256="sha256-jOA2TxDgaJUJ2Jn7dVGZUbjmphTDuVZahzSaxfJpRqE=";
|
||||
sha256="sha256-G6rMTHvrBJbUaTNkR738YClAn2v2xVBr+tXLjpNzVZg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
50
pkgs/development/python-modules/asks/default.nix
Normal file
50
pkgs/development/python-modules/asks/default.nix
Normal file
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, anyio
|
||||
, async_generator
|
||||
, h11
|
||||
, curio
|
||||
, overly
|
||||
, pytestCheckHook
|
||||
, trio
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asks";
|
||||
version = "3.0.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "theelous3";
|
||||
repo = "asks";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ipQ5n2386DqR3kNpmTVhNPG+LC7gfCbvrlZ97+UP55g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
anyio
|
||||
async_generator
|
||||
h11
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
curio
|
||||
overly
|
||||
pytestCheckHook
|
||||
trio
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "asks" ];
|
||||
|
||||
meta = {
|
||||
description = "Async requests-like HTTP library for Python";
|
||||
homepage = "https://github.com/theelous3/asks";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "greeclimate";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "cmroche";
|
||||
repo = "greeclimate";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DRVCBbGj0NfQBn9qNRc0Gu3LNO6KDNF1/ZdSAuhCVsM=";
|
||||
hash = "sha256-SvAvLxWk/IIlkv54cUVN6FXj9rrM0QPKHAk36+PuqP0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nextcord";
|
||||
version = "2.0.0b2";
|
||||
version = "2.0.0b3";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "nextcord";
|
||||
repo = "nextcord";
|
||||
rev = version;
|
||||
hash = "sha256-yp24eOmwdi5X2Y20jqq88CDFvmc6P5omOsSWFr2MWGI=";
|
||||
hash = "sha256-ygRbgL+px93Gx0Sv6d5AX+0CPYoOc2V1rnuViRa4Zy0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
40
pkgs/development/python-modules/overly/default.nix
Normal file
40
pkgs/development/python-modules/overly/default.nix
Normal file
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, h11
|
||||
, sansio-multipart
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "overly";
|
||||
version = "0.1.85";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "20a99526c7859acc859e87afd97b5c4916405e7477834f727b49210e478370cb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
h11
|
||||
sansio-multipart
|
||||
];
|
||||
|
||||
# upstream has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "overly" ];
|
||||
|
||||
meta = {
|
||||
description = "An overly configurable http server for client testing";
|
||||
homepage = "https://github.com/theelous3/overly";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
broken = stdenv.isDarwin; # https://github.com/theelous3/overly/issues/2
|
||||
};
|
||||
}
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-annotate";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0NpMPYcqfVeWrIUBbKodo4rpAr69x1nhtsD2+LWAJ0E=";
|
||||
hash = "sha256-CSaTIPjSGHKCR0Nvet6W8zzz/oWEC0BjIULZ+JaMH9A=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
50
pkgs/development/python-modules/rmcl/default.nix
Normal file
50
pkgs/development/python-modules/rmcl/default.nix
Normal file
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, poetry-core
|
||||
, asks
|
||||
, trio
|
||||
, xdg
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rmcl";
|
||||
version = "0.4.2";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "58de4758e7e3cb7acbf28fcfa80f4155252afdfb191beb4ba4aa36961f66cc67";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '= "^' '= ">='
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asks
|
||||
trio
|
||||
xdg
|
||||
];
|
||||
|
||||
# upstream has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "rmcl" ];
|
||||
|
||||
meta = {
|
||||
description = "ReMarkable Cloud Library";
|
||||
homepage = "https://github.com/rschroll/rmcl";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
47
pkgs/development/python-modules/rmrl/default.nix
Normal file
47
pkgs/development/python-modules/rmrl/default.nix
Normal file
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, poetry-core
|
||||
, pdfrw
|
||||
, reportlab
|
||||
, svglib
|
||||
, xdg
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rmrl";
|
||||
version = "0.2.1";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c532bef4168350e6ab17cf37c6481dc12b6a78e007c073503f082f36215b71c9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pdfrw
|
||||
reportlab
|
||||
svglib
|
||||
xdg
|
||||
];
|
||||
|
||||
# upstream has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "rmrl" ];
|
||||
|
||||
meta = {
|
||||
description = "Render reMarkable documents to PDF";
|
||||
homepage = "https://github.com/rschroll/rmrl";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
32
pkgs/development/python-modules/sansio-multipart/default.nix
Normal file
32
pkgs/development/python-modules/sansio-multipart/default.nix
Normal file
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy27
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sansio-multipart";
|
||||
version = "0.3";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "sansio_multipart";
|
||||
inherit version;
|
||||
sha256 = "6e95b2e64039a95d0f2cd8f3360eaf418d6b9018fb2215d82d399d62d6122dc3";
|
||||
};
|
||||
|
||||
# upstream has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "sansio_multipart" ];
|
||||
|
||||
meta = {
|
||||
description = "Parser for multipart/form-data";
|
||||
homepage = "https://github.com/theelous3/sansio-multipart-parser";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
|
@ -1,11 +1,11 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, cssselect2
|
||||
, lxml
|
||||
, pillow
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, reportlab
|
||||
, tinycss2
|
||||
}:
|
||||
|
@ -14,13 +14,15 @@ buildPythonPackage rec {
|
|||
pname = "svglib";
|
||||
version = "1.3.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-o4mYuV0buZVk3J3/rxXk6UU3YfJ5DS3UFHpK1fusEHg=";
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cssselect2
|
||||
lxml
|
||||
|
@ -30,14 +32,16 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Ignore tests that require network access (TestWikipediaFlags and TestW3CSVG), and tests that
|
||||
# require files missing in the 1.0.0 PyPI release (TestOtherFiles).
|
||||
checkPhase = ''
|
||||
py.test svglib tests -k 'not TestWikipediaFlags and not TestW3CSVG and not TestOtherFiles'
|
||||
'';
|
||||
pytestFlagsArray = [
|
||||
"-k 'not TestWikipediaFlags and not TestW3CSVG and not TestOtherFiles'"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "svglib.svglib" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/deeplook/svglib";
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "xmlschema";
|
||||
version = "1.11.1";
|
||||
version = "1.11.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "sissaschool";
|
||||
repo = "xmlschema";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ccbVYvQBM4U8wgNXlgi5qYxUZHpajWs/eVXbCFdG5bU=";
|
||||
hash = "sha256-coQbO5XrFjU9rAN5Vw/BlMHpkQzQy6t0dNfFsMeO2+o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abcMIDI";
|
||||
version = "2022.05.20";
|
||||
version = "2022.06.07";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
|
||||
hash = "sha256-mTIpy5HHKQxpqN5mHnDvmq6lA0++etj93WCcX1i046I=";
|
||||
hash = "sha256-gMEqcdpJ4dFnxmGJHayM6ZH+n6osHvZ8Tlxk0Vvm1qI=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -24,7 +24,7 @@ let
|
|||
}.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "ventoy-bin";
|
||||
version = "1.0.75";
|
||||
version = "1.0.76";
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper ]
|
||||
++ lib.optional withQt5 qt5.wrapQtAppsHook;
|
||||
|
@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz";
|
||||
sha256 = "64487c11da3be1aa95ae5631c12fcfefbabf3d27c80d8992145e572c5e44a535";
|
||||
sha256 = "f13c3c81eafe15ae4b3de3d98d240d94eabba7cda8e3330ff1769502ecfa33c0";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ooniprobe-cli";
|
||||
version = "3.15.0";
|
||||
version = "3.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ooni";
|
||||
repo = "probe-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lIRU6TM76/uX2LA4hdWbF4fbbcfGMUzmGz4e1PTyH3c=";
|
||||
hash = "sha256-s1q9QgdbLmMaEV2ovGRKWHRhUFvbTHhFvo7ALdhUG4Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "h06WoKykuVzNgco74YbpSP+1nu/bOEf2mT4rUEX8MxU=";
|
||||
vendorSha256 = "sha256-h06WoKykuVzNgco74YbpSP+1nu/bOEf2mT4rUEX8MxU=";
|
||||
|
||||
subPackages = [ "cmd/ooniprobe" ];
|
||||
|
||||
|
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vopono";
|
||||
version = "0.8.10";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-+ZRvuUA7BvM8YW1QZQ7iJrLvleitl1hqEOrTkrLVSes";
|
||||
sha256 = "sha256-6fK4A7/Ezi6MZxDec565g2LnDkTyGgQhiqzZznwG3s8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zM5JufS0qEYPEEwl6iPZYge3cssrsLu835AhAd8F3vc";
|
||||
cargoHash = "sha256-lNBmX8UyGPQARjxYF9ECzVfgDtqXdHyB4GvjCgXoiLo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Run applications through VPN connections in network namespaces";
|
||||
|
|
|
@ -675,6 +675,8 @@ in {
|
|||
|
||||
asgiref = callPackage ../development/python-modules/asgiref { };
|
||||
|
||||
asks = callPackage ../development/python-modules/asks { };
|
||||
|
||||
asmog = callPackage ../development/python-modules/asmog { };
|
||||
|
||||
asn1 = callPackage ../development/python-modules/asn1 { };
|
||||
|
@ -6439,6 +6441,8 @@ in {
|
|||
|
||||
openapi-core = callPackage ../development/python-modules/openapi-core { };
|
||||
|
||||
overly = callPackage ../development/python-modules/overly { };
|
||||
|
||||
pandas-stubs = callPackage ../development/python-modules/pandas-stubs { };
|
||||
|
||||
parameterizedtestcase = callPackage ../development/python-modules/parameterizedtestcase { };
|
||||
|
@ -9258,6 +9262,10 @@ in {
|
|||
|
||||
rlp = callPackage ../development/python-modules/rlp { };
|
||||
|
||||
rmcl = callPackage ../development/python-modules/rmcl { };
|
||||
|
||||
rmrl = callPackage ../development/python-modules/rmrl { };
|
||||
|
||||
rnc2rng = callPackage ../development/python-modules/rnc2rng { };
|
||||
|
||||
rnginline = callPackage ../development/python-modules/rnginline { };
|
||||
|
@ -9424,6 +9432,8 @@ in {
|
|||
|
||||
sanic-testing = callPackage ../development/python-modules/sanic-testing { };
|
||||
|
||||
sansio-multipart = callPackage ../development/python-modules/sansio-multipart { };
|
||||
|
||||
sarif-om = callPackage ../development/python-modules/sarif-om { };
|
||||
|
||||
sarge = callPackage ../development/python-modules/sarge { };
|
||||
|
|
Loading…
Reference in a new issue