Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
6153b45ad6
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reaper";
|
||||
version = "6.38";
|
||||
version = "6.43";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.hostPlatform.qemuArch}.tar.xz";
|
||||
hash = {
|
||||
x86_64-linux = "sha256-K5EnrmzP8pyW9dR1fbMzkPzpS6aHm8JF1+m3afnH4rU=";
|
||||
aarch64-linux = "sha256-6wNWDXjQNyfU2l9Xi9JtmAuoKtHuIY5cvNMjYkwh2Sk=";
|
||||
x86_64-linux = "sha256-VQ91px9YZWbrw31fFQxS+H/6fsjkLDrYU6FtI8eSq6E=";
|
||||
aarch64-linux = "sha256-x6z5+H7ASWiuNL0maNGK05VmJptHdFGRiFf6DgwlZDw=";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
};
|
||||
|
||||
@ -78,6 +78,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.reaper.fm/";
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ jfrankenau ilian orivej ];
|
||||
maintainers = with maintainers; [ jfrankenau ilian orivej uniquepointer ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,15 @@
|
||||
{ lib
|
||||
, anyio
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, curio
|
||||
, fetchFromGitHub
|
||||
, hypothesis
|
||||
, pytest
|
||||
, pytest-mypy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, types-setuptools
|
||||
, sniffio
|
||||
, trio
|
||||
, trio-asyncio
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -15,19 +19,29 @@ buildPythonPackage rec {
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ZPG6k+ZNi6FQftIVwr/Lux5rJlo284V/mjtYepNScdQ=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "klen";
|
||||
repo = "pytest-aio";
|
||||
rev = version;
|
||||
sha256 = "pLH0yXe/KS9ohI8+hWSprP1OA3Qjki2BPqeApMPMGDs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/addopts/d' setup.cfg
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-mypy
|
||||
anyio
|
||||
curio
|
||||
hypothesis
|
||||
pytestCheckHook
|
||||
types-setuptools
|
||||
sniffio
|
||||
trio
|
||||
trio-asyncio
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-izone";
|
||||
version = "1.1.8";
|
||||
version = "1.2.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "Swamp-Ig";
|
||||
repo = "pizone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/qPWSTO0PV4lEgwWpgcoBnbUtDUrEVItb4NF9TV2QJU=";
|
||||
hash = "sha256-WF37t9vCEIyQMeN3/CWAiiZ5zsMRMFQ5UvMUqfoGM9I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -34,10 +34,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Test are blocking
|
||||
"tests/test_fullstack.py"
|
||||
];
|
||||
doCheck = false; # most tests access network
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pizone"
|
||||
|
||||
47
pkgs/development/python-modules/trio-asyncio/default.nix
Normal file
47
pkgs/development/python-modules/trio-asyncio/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, trio
|
||||
, outcome
|
||||
, sniffio
|
||||
, pytest-trio
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "trio-asyncio";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "trio_asyncio";
|
||||
inherit version;
|
||||
sha256 = "824be23b0c678c0df942816cdb57b92a8b94f264fffa89f04626b0ba2d009768";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
trio
|
||||
outcome
|
||||
sniffio
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-trio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/python" # tries to import internal API test.test_asyncio
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Re-implementation of the asyncio mainloop on top of Trio";
|
||||
homepage = "https://github.com/python-trio/trio-asyncio";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-task";
|
||||
@ -15,6 +15,8 @@ buildGoModule rec {
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
subPackages = [ "cmd/task" ];
|
||||
|
||||
ldflags = [
|
||||
@ -23,6 +25,8 @@ buildGoModule rec {
|
||||
|
||||
postInstall = ''
|
||||
ln -s $out/bin/task $out/bin/go-task
|
||||
|
||||
installShellCompletion completion/{bash,fish,zsh}/*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1337,8 +1337,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "scala";
|
||||
publisher = "scala-lang";
|
||||
version = "0.5.3";
|
||||
sha256 = "0isw8jh845hj2fw7my1i19b710v3m5qsjy2faydb529ssdqv463p";
|
||||
version = "0.5.5";
|
||||
sha256 = "1gqgamm97sq09za8iyb06jf7hpqa2mlkycbx6zpqwvlwd3a92qr1";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@ -1349,8 +1349,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "metals";
|
||||
publisher = "scalameta";
|
||||
version = "1.10.4";
|
||||
sha256 = "0q6zjpdi98png4vpzz39q85nxmsh3h1nnan58saz5rr83d6jgj89";
|
||||
version = "1.10.15";
|
||||
sha256 = "1yzvwdxipilxpg50sh1glm6p2mmn75pzq8kadk7cyl1kqlqd40ii";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.asl20;
|
||||
|
||||
@ -14,15 +14,15 @@ let
|
||||
inherit (lib) last splitString;
|
||||
|
||||
pname = "winbox";
|
||||
version = "3.31";
|
||||
version = "3.32";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
executable = fetchurl (if use64 then {
|
||||
url = "https://download.mikrotik.com/winbox/${version}/${pname}64.exe";
|
||||
sha256 = "sha256-aE6RZ2bCYahxH5QWxBH4CJOjW9dbzibx8zQ4Z5652V4=";
|
||||
sha256 = "1gf0zdn4ahfp08fn5w0nzigwldl3bjqcj2f08rcvyn0mbwar4znn";
|
||||
} else {
|
||||
url = "https://download.mikrotik.com/winbox/${version}/${pname}.exe";
|
||||
sha256 = "sha256-yyKiU5xJlp/VQVYuX79pdCEve63yV3SUzi+/c915gAc=";
|
||||
sha256 = "18rmbnv7iwba19sfh4q4wfwh385snrmpvs6dyad2s9rv7vh2nch7";
|
||||
});
|
||||
# This is from the winbox AUR package:
|
||||
# https://aur.archlinux.org/cgit/aur.git/tree/winbox64?h=winbox64&id=8edd93792af84e87592e8645ca09e9795931e60e
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGo117Module, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGo117Module rec {
|
||||
pname = "kopia";
|
||||
version = "0.9.7";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nHMsh+2Wpca2SJSy1XRMWwHHcdjpnb1u9JS6wM4E65Y=";
|
||||
sha256 = "sha256-7Bvgtp6egZqpTv4Ac+OUkhKzTZhRRMwpdvwOCBA6Dso=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-SJKsTZMppu6eit4ssMSwJOkeaheEYUwWRDPyPjirNHM=";
|
||||
vendorSha256 = "sha256-/dCRM61Zl5YbIb0mKhcyLU15nQhR31QAaq+5TwRK4pM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -9752,6 +9752,8 @@ in {
|
||||
|
||||
trio = callPackage ../development/python-modules/trio { };
|
||||
|
||||
trio-asyncio = callPackage ../development/python-modules/trio-asyncio { };
|
||||
|
||||
trueskill = callPackage ../development/python-modules/trueskill { };
|
||||
|
||||
trustme = callPackage ../development/python-modules/trustme { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user