mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-20 00:53:12 +03:00
Merge master into staging-next
This commit is contained in:
commit
ed1a3b893c
@ -8,7 +8,7 @@
|
||||
|
||||
let
|
||||
pname = "trezor-suite";
|
||||
version = "21.10.2";
|
||||
version = "21.11.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
suffix = {
|
||||
@ -19,8 +19,8 @@ let
|
||||
src = fetchurl {
|
||||
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
|
||||
sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
|
||||
aarch64-linux = "sha512-+qXN9cQk1u18ZzeMecPNfhkTTsw61iM/IJYksPJl9+zx2AKldv9tAFUnnmKZ65LabiaIXI+emN185SRRcaOndw==";
|
||||
x86_64-linux = "sha512-WpiG8VOEODqsQ1/jERiEEGwVqR0zbMqERGjOysEVYorA0p3xZyl7OSpWOSWaUjPBZpQtJIBdqhSXeoSRcvfJgg==";
|
||||
aarch64-linux = "sha512-QX5Ak2F1aD846BuGNcP1K/2c77Ut3LK3UiXsUPqiSBGZ9YRgdzROqdGjCVnTBBhxeCfGYQDhWmpuOpNbLr4eYg==";
|
||||
x86_64-linux = "sha512-ckMlZoLEq3aLzyhoWf2rRE3XxNQhqo6rUHF2NKoV08sXz+Zth2Lk+P3te1vwFQl+Efryl84RTwVGWKmloZ8k9A==";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tut";
|
||||
version = "0.0.36";
|
||||
version = "0.0.41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RasmusLindroth";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Ew/nrsJivq/3/vlZnR1gwhqzQQ9YmrW2LPD7qjmPH4A=";
|
||||
sha256 = "sha256-13d3EE/rswcHRALUfL46qpKYJUDwGiou5kUz+nCC8VQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Q1H/Y2mDTr24JQMoTf8DL3cj5oF9lH0uaJD2g/0Yxko=";
|
||||
vendorSha256 = "sha256-RtvzQvZIFdLo24U9IWcoL9qnf4/q/+1UCrb7dcRKEIE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A TUI for Mastodon with vim inspired keys";
|
||||
|
@ -1,25 +1,34 @@
|
||||
{ fetchurl, stdenv, lib, makeWrapper,
|
||||
erlang,
|
||||
python2, python2Packages,
|
||||
perlPackages,
|
||||
gnuplot }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, erlang
|
||||
, python3
|
||||
, python3Packages
|
||||
, perlPackages
|
||||
, gnuplot
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tsung";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://tsung.erlang-projects.org/dist/tsung-${version}.tar.gz";
|
||||
sha256 = "6394445860ef34faedf8c46da95a3cb206bc17301145bc920151107ffa2ce52a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
erlang
|
||||
gnuplot
|
||||
perlPackages.perl
|
||||
perlPackages.TemplateToolkit
|
||||
python2
|
||||
python2Packages.matplotlib
|
||||
python3
|
||||
python3Packages.matplotlib
|
||||
];
|
||||
|
||||
|
||||
@ -43,8 +52,8 @@ stdenv.mkDerivation rec {
|
||||
can currently be used to stress HTTP, WebDAV, SOAP, PostgreSQL, MySQL,
|
||||
AMQP, MQTT, LDAP and Jabber/XMPP servers.
|
||||
'';
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.uskudnik ];
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ uskudnik ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
gccStdenv.mkDerivation rec {
|
||||
pname = "programmer-calculator";
|
||||
version = "2.1";
|
||||
version = "2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alt-romes";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1vvpbj24ijl9ma0h669n9x0z1im3vqdf8zf2li0xf5h97b14gmv0";
|
||||
sha256 = "sha256-JQcYCYKdjdy8U2XMFzqTH9kAQ7CFv0r+sC1YfuAm7p8=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.bsdOriginal;
|
||||
maintainers = [ maintainers.ebzzry ];
|
||||
platforms = platforms.unix;
|
||||
badPlatforms = [ "aarch64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
@ -1,6 +1,12 @@
|
||||
{ lib, fetchPypi, buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, flake8
|
||||
, mock, pep8, pytest }:
|
||||
, mock
|
||||
, pep8
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flake8-polyfill";
|
||||
@ -11,12 +17,6 @@ buildPythonPackage rec {
|
||||
sha256 = "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead.
|
||||
substituteInPlace setup.cfg \
|
||||
--replace pytest 'tool:pytest'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
flake8
|
||||
];
|
||||
@ -24,13 +24,28 @@ buildPythonPackage rec {
|
||||
checkInputs = [
|
||||
mock
|
||||
pep8
|
||||
pytest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest tests
|
||||
patches = [
|
||||
# Skip unnecessary tests on Flake8, https://github.com/PyCQA/pep8-naming/pull/181
|
||||
(fetchpatch {
|
||||
name = "skip-tests.patch";
|
||||
url = "https://github.com/PyCQA/flake8-polyfill/commit/3cf414350e82ceb835ca2edbd5d5967d33e9ff35.patch";
|
||||
sha256 = "mElZafodq8dF3wLO/LOqwFb7eLMsPLlEjNSu5AWqets=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead.
|
||||
substituteInPlace setup.cfg \
|
||||
--replace pytest 'tool:pytest'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"flake8_polyfill"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.com/pycqa/flake8-polyfill";
|
||||
description = "Polyfill package for Flake8 plugins";
|
||||
|
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, flake8
|
||||
, flake8-polyfill
|
||||
@ -20,6 +21,15 @@ buildPythonPackage rec {
|
||||
flake8-polyfill
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Add missing option to get passing tests, https://github.com/PyCQA/pep8-naming/pull/181
|
||||
(fetchpatch {
|
||||
name = "add-missing-option.patch";
|
||||
url = "https://github.com/PyCQA/pep8-naming/commit/03b8f36f6a8bb8bc79dfa5a71ad9be2a0bf8bbf5.patch";
|
||||
sha256 = "1YTh84Yoj0MqFZoifM362563r1GuzaF+mMmdT/ckC7I=";
|
||||
})
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python.interpreter} run_tests.py
|
||||
|
@ -16,6 +16,7 @@ buildPythonPackage rec {
|
||||
pname = "py17track";
|
||||
version = "3.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -44,13 +45,18 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace ">=19.3,<21.0" ">=19.3,<22.0"
|
||||
--replace 'attrs = ">=19.3,<21.0"' 'attrs = ">=19.3,<22.0"' \
|
||||
--replace 'async-timeout = "^3.0.1"' 'async-timeout = ">=3.0.1,<5.0.0"'
|
||||
'';
|
||||
|
||||
# Ignore the examples directory as the files are prefixed with test_
|
||||
disabledTestPaths = [ "examples/" ];
|
||||
disabledTestPaths = [
|
||||
# Ignore the examples directory as the files are prefixed with test_
|
||||
"examples/"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "py17track" ];
|
||||
pythonImportsCheck = [
|
||||
"py17track"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to track package info from 17track.com";
|
||||
|
@ -1,16 +1,12 @@
|
||||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, coverage
|
||||
, django
|
||||
, factory_boy
|
||||
, fetchFromGitHub
|
||||
, isPy3k
|
||||
, lib
|
||||
|
||||
# pythonPackages
|
||||
, django
|
||||
, pylint-plugin-utils
|
||||
|
||||
# pythonPackages for checkInputs
|
||||
, coverage
|
||||
, factory_boy
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -30,17 +26,26 @@ buildPythonPackage rec {
|
||||
pylint-plugin-utils
|
||||
];
|
||||
|
||||
checkInputs = [ coverage factory_boy pytest ];
|
||||
checkInputs = [
|
||||
coverage
|
||||
factory_boy
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Check command taken from scripts/test.sh
|
||||
# Skip test external_django_tables2_noerror_meta_class:
|
||||
# requires an unpackaged django_tables2
|
||||
checkPhase = ''
|
||||
python pylint_django/tests/test_func.py -v -k "not tables2"
|
||||
'';
|
||||
disabledTests = [
|
||||
# Skip outdated tests and the one with a missing dependency (django_tables2)
|
||||
"external_django_tables2_noerror_meta_class"
|
||||
"external_factory_boy_noerror"
|
||||
"func_noerror_foreign_key_attributes"
|
||||
"func_noerror_foreign_key_key_cls_unbound"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pylint_django"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Pylint plugin to analyze Django applications";
|
||||
description = "Pylint plugin to analyze Django applications";
|
||||
homepage = "https://github.com/PyCQA/pylint-django";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ kamadorueda ];
|
||||
|
@ -145,13 +145,13 @@ rec {
|
||||
headers = "0r1qxgkpcn03fd28zbz86ilhsqg0gzp9clbghr5w6gy5ak8y68hz";
|
||||
};
|
||||
|
||||
electron_16 = mkElectron "16.0.1" {
|
||||
armv7l-linux = "9fe58dcc8838fc641e9fc6f2723ece6f12c29169340da3ab754e1afc57634314";
|
||||
aarch64-linux = "991369b7dee6cf9c146c48566153baf898b5ed73efaada2688d1699d69ba366c";
|
||||
x86_64-linux = "4063b6d05c9320fc53535a7d932e03f94ad0aae95432437bbf2f2f222b67c5a5";
|
||||
i686-linux = "68a817a999dcc996497c53e54f06199af0c2de278ff910c28845405d1b1828f0";
|
||||
x86_64-darwin = "7e28327d3efb013f19295e2491208491c66b117a167e9e56d141d0516d6d5587";
|
||||
aarch64-darwin = "f05684ca31d3d98746bca9ec05d425998d60af640958eeb55f464747ceb97bdf";
|
||||
headers = "0sk6h0jqfw2q9h05xdzivwfa6040r4racf82s8i5xkw5s13vsl6d";
|
||||
electron_16 = mkElectron "16.0.2" {
|
||||
armv7l-linux = "bba43eb1e2718f04f6d91096cf22d4c49cbab0915f48b3b22b8f94f205eda2f0";
|
||||
aarch64-linux = "3a2ad9c508bfb8e1b2635a3af0a7495e1121bc7aea64a9b771322a60bb82e265";
|
||||
x86_64-linux = "2f96a5b773b790d968a6b2c1142f8d231587b775be113e7ee90d9a89bec8cd70";
|
||||
i686-linux = "4fd01951b3f57b69731f85d6eae6962257c3a70c37d74751a098bc00ea43085a";
|
||||
x86_64-darwin = "a3b9fd83dea4cfa959ddd72be4cbcb8d0503f4ab2741705561b62de8b5218895";
|
||||
aarch64-darwin = "3894d141b060d37f1248556525e96a9fc1d4afc237b740f5093bdcd5731972d1";
|
||||
headers = "0h1gzrd6rdd217q0im0g1hr3b037dmi4v6wk30kzb12597ww59n1";
|
||||
};
|
||||
}
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gdu";
|
||||
version = "5.10.1";
|
||||
version = "5.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dundee";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vBsjCSbgVo2kQJLB/ZyAG2F+80mVA3UF2RN+O0YQbhs=";
|
||||
sha256 = "sha256-GOZms7kYAWQ0VBr8p3RjsQvKXN+lkP9ytHta/Fgln0c=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac";
|
||||
|
Loading…
Reference in New Issue
Block a user