mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
Merge staging-next into staging
This commit is contained in:
commit
4cff5cf6ba
@ -27,7 +27,7 @@ in
|
||||
services.xserver.displayManager.lightdm.greeters.slick = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Whether to enable lightdm-slick-greeter as the lightdm greeter.
|
||||
'';
|
||||
|
@ -9,13 +9,13 @@ let
|
||||
else throw "unsupported platform";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "pixelorama";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Orama-Interactive";
|
||||
repo = "Pixelorama";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+Sfhv66skHawe6jzfzQyFxejN5TvTdmWunzl0/7yy4M=";
|
||||
sha256 = "sha256-IqOBZGo0M8JfREpCv14AvRub6yVTpKfAd5JCNqCVolQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "495";
|
||||
version = "496";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-MuSK19oSrRJZebATRpDW1CmUq4NKcpuoPmOuLyvL8A8=";
|
||||
sha256 = "sha256-Ng3ogPxyzn4cKVE/0iz56VWGyABkM2ZF7ktajaJ9Mn8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,9 +1,9 @@
|
||||
{ buildGoModule, fetchFromGitHub, installShellFiles, lib }:
|
||||
|
||||
let
|
||||
humioCtlVersion = "0.29.1";
|
||||
sha256 = "sha256-89rVUzxUf9lM1KE55m1EQidwc26q/QadY0kgu/afj9I=";
|
||||
vendorSha256 = "sha256-n9gfY6oNxOjU6sGm8Bd8asFlHxm+dzHdVWj4CmfvFpA=";
|
||||
humioCtlVersion = "0.29.2";
|
||||
sha256 = "sha256-Ba3xy2hbU6Gq/TeLnNxSkJga8CqHNyqSgx2ZrFhThL4=";
|
||||
vendorSha256 = "sha256-70QxW2nn6PS6HZWllmQ8O39fbUcbe4c/nKAygLnD4n0=";
|
||||
in buildGoModule {
|
||||
name = "humioctl-${humioCtlVersion}";
|
||||
pname = "humioctl";
|
||||
|
33
pkgs/development/python-modules/arnparse/default.nix
Normal file
33
pkgs/development/python-modules/arnparse/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "arnparse";
|
||||
version = "0.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PokaInc";
|
||||
repo = "arnparse";
|
||||
rev = version;
|
||||
sha256 = "sha256-2+wxzYoS/KJXjYM6lZguxbr2Oxobo0eFNnzWZHLi0WM=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"arnparse"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Parse ARNs using Python";
|
||||
homepage = "https://github.com/PokaInc/arnparse";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
};
|
||||
}
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "atlassian-python-api";
|
||||
version = "3.25.0";
|
||||
version = "3.26.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "atlassian-api";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-O0hD8PCmUH38k2a0cnt4Ihb+8/wb9RIL27xc/LONBU0=";
|
||||
sha256 = "sha256-S1+QKSxoBSIebsqhx4OgQAOhNw3P674m/V203ylXB+c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak-retry-connector";
|
||||
version = "1.10.1";
|
||||
version = "1.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cdPFyuDRdZJZ/HQq9xO3TojnNS34F+2JiwTIcxQWONM=";
|
||||
hash = "sha256-I9nXLzy+OmfaQJBTeBSL/yhhrdNnldd42d5QwRDK9Q4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cement";
|
||||
version = "3.0.6";
|
||||
version = "3.0.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fccec41eab3f15a03445b1ce24c8a7e106d4d5520f6507a7145698ce68923d31";
|
||||
sha256 = "sha256-rRGmlGZeKtKEV8VgSU9PjDaiX8WOUA1gip2R4E4dMJM=";
|
||||
};
|
||||
|
||||
# Disable test tests since they depend on a memcached server running on
|
||||
|
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chart-studio";
|
||||
version = "5.9.0";
|
||||
version = "5.10.0";
|
||||
|
||||
# chart-studio was split from plotly
|
||||
src = fetchFromGitHub {
|
||||
owner = "plotly";
|
||||
repo = "plotly.py";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-o14uP7czY4DDTFDabOk7aTF3mMPmBrPg1/fkoIUlab8=";
|
||||
sha256 = "sha256-j1MiLUSIun0xnUFCcyZ5p8eGF5Q34jCwoVuQG5xSlkU=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/packages/python/chart-studio";
|
||||
|
@ -1,13 +1,14 @@
|
||||
{ lib
|
||||
, bleak
|
||||
, bleak-retry-connector
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, bluepy
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cometblue-lite";
|
||||
version = "0.4.1";
|
||||
version = "0.5.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -16,11 +17,12 @@ buildPythonPackage rec {
|
||||
owner = "neffs";
|
||||
repo = "python-cometblue_lite";
|
||||
rev = version;
|
||||
sha256 = "sha256-kK6P8almFQac/bt7we02Q96RIB/s9wAqb+dn09tFx7k=";
|
||||
hash = "sha256-23HspTZ0kN3+geDnqdH6Vj5NfmmbVku2vPTdsy0XvRU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bluepy
|
||||
bleak
|
||||
bleak-retry-connector
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
@ -31,7 +33,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for Eurotronic Comet Blue thermostats";
|
||||
description = "Module for Eurotronic Comet Blue thermostats";
|
||||
homepage = "https://github.com/neffs/python-cometblue_lite";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
|
@ -13,13 +13,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "enaml";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nucleic";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-kS15x7fZsHlARh1ILsQpJnwozutuoIysTCCKwkNCa7Y=";
|
||||
sha256 = "sha256-FNp/8Fs+06m4kiczkN5lx5Qly0ALLtSmxD4LkkJiqho=";
|
||||
};
|
||||
|
||||
# qt bindings cannot be found during tests
|
||||
|
@ -3,26 +3,36 @@
|
||||
, fetchFromGitHub
|
||||
, click
|
||||
, six
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "geomet";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
# pypi tarball doesn't include tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "geomet";
|
||||
repo = "geomet";
|
||||
rev = version;
|
||||
sha256 = "1lb0df78gkivsb7hy3ix0xccvcznvskip11hr5sgq5y76qnfc8p0";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7QfvGQlg4nTr1rwTyvTNm6n/jFptLtpBKMjjQj6OXCQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click six ];
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
six
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"geomet"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Convert GeoJSON to WKT/WKB (Well-Known Text/Binary) and vice versa";
|
||||
homepage = "https://github.com/geomet/geomet";
|
||||
license = licenses.asl20;
|
||||
description = "Convert GeoJSON to WKT/WKB (Well-Known Text/Binary), and vice versa.";
|
||||
maintainers = with maintainers; [ turion ris ];
|
||||
};
|
||||
}
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "glances-api";
|
||||
version = "0.3.6";
|
||||
version = "0.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-ecosystem";
|
||||
repo = "python-glances-api";
|
||||
rev = version;
|
||||
sha256 = "sha256-2H8S08tntCNKwMw553/wuWLXmri7b2tLxFlgCDJWQNQ=";
|
||||
sha256 = "sha256-T7Z+xipTuE7IE9v+ZmiMvP5g8a/MU0ExnaE11DRjvpM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ibm-watson";
|
||||
version = "6.0.0";
|
||||
version = "6.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,8 +23,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "watson-developer-cloud";
|
||||
repo = "python-sdk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AvWcw1VV47v2yvaqukPSql7rA7wVwrvtCDsvYtPZXKs=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-jvDkAwuDFgo7QlZ8N7TNVsY7+aXdIDc50uIIoO+5MLs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, rx
|
||||
@ -14,16 +15,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "influxdb-client";
|
||||
version = "1.30.0";
|
||||
version = "1.31.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "influxdata";
|
||||
repo = "influxdb-client-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YGKFvRy76/klXhJ8Cdgqv9YqCq4E6XIiwWXl8W9fRX4=";
|
||||
hash = "sha256-gTJgY4vFgmFDn2WYUKEbvbu7hjxcw2QGI+blensS5BI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -33,10 +34,18 @@ buildPythonPackage rec {
|
||||
python-dateutil
|
||||
setuptools
|
||||
urllib3
|
||||
ciso8601
|
||||
pytz
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
async = [
|
||||
aiohttp
|
||||
];
|
||||
ciso = [
|
||||
ciso8601
|
||||
];
|
||||
};
|
||||
|
||||
# requires influxdb server
|
||||
doCheck = false;
|
||||
|
||||
|
@ -15,11 +15,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "knack";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7fcab17585c0236885eaef311c01a1e626d84c982aabcac81703afda3f89c81f";
|
||||
sha256 = "sha256-ExkPqV1MIbzgS0vuItak4/sZqTtpmbHRBL0CxHZwbCg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mdformat";
|
||||
version = "0.7.14";
|
||||
version = "0.7.15";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "executablebooks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-bImBW6r8g/4MQ9yNrBBhk7AGqKRXFyAew6HHEmqelxw=";
|
||||
sha256 = "sha256-Okkkc7cv4OROQ7tP1YMcdXbK6o6wvuzYFLTCqVu/4ck=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyswitchbot";
|
||||
version = "0.18.10";
|
||||
version = "0.18.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pySwitchbot";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tK5U94rHPz/LHU4qAj1yv8CtMhjpAIQ1ktFooVIIqiw=";
|
||||
hash = "sha256-9eg66+LbUr2px5jVcEopC5UIwZZU51bicDn8lMuDR6U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -8,17 +8,21 @@
|
||||
, pyusb
|
||||
, hostPlatform
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rfcat";
|
||||
version = "1.9.5";
|
||||
version = "1.9.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atlas0fd00m";
|
||||
repo = "rfcat";
|
||||
rev = "v${version}";
|
||||
sha256 = "1mmr7g7ma70sk6vl851430nqnd7zxsk7yb0xngwrdx9z7fbz2ck0";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7iYz7YY9zpnJmLfCmp/sF21eZ21HMGq2sLQIENxbr34=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -38,7 +42,9 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "rflib" ];
|
||||
pythonImportsCheck = [
|
||||
"rflib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Swiss Army knife of sub-GHz ISM band radio";
|
||||
|
@ -1,23 +1,32 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, pythonOlder, sphinx }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, sphinx
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-katex";
|
||||
version = "0.8.6";
|
||||
version = "0.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
# pkgutil namespaces are broken in nixpkgs (because they can't scan multiple
|
||||
# directories). But python2 is EOL, so not supporting it should be ok.
|
||||
disabled = pythonOlder "3";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c3dcdb2984626a0e6c1b11bc2580c7bbc6ab3711879b23bbf26c028a0f4fd4f2";
|
||||
hash = "sha256-HFs1+9tWl1D5VWY14dPCk+Ewv+ubedhd9DcCSrPQZnQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sphinx ];
|
||||
propagatedBuildInputs = [
|
||||
sphinx
|
||||
];
|
||||
|
||||
# There are no unit tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "sphinxcontrib.katex" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sphinxcontrib.katex"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sphinx extension using KaTeX to render math in HTML";
|
||||
|
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stripe";
|
||||
version = "4.0.2";
|
||||
version = "4.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0IWz6UUKVVCRL0dsbbsrr6Ep5IXiTW9AR8UJT/CNXeI=";
|
||||
hash = "sha256-hSrKk/Lu6rWCPSrPSlvtsl+Ub6EM6llaW1l9B0jxNl8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vt-py";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "VirusTotal";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-901VW56vr6ysMlzspgVbPMLnDIpJRgSEOEQ8ohHp+mc=";
|
||||
sha256 = "sha256-T0QvYVh5VRxpRdFWsnYpYdAypRc3yYwsXdsOiykRj0s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yalexs-ble";
|
||||
version = "1.4.0";
|
||||
version = "1.6.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DGNq/+3RJUTWixwR86zIE3rrNxRow6S8x0wZPMO+EiU=";
|
||||
hash = "sha256-U63SuHUs7xaxv3qkI36NhB6nkSE8/NVzKPckHvkgZZw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "oq";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Blacksmoke16";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1IdOyfoGAsZ5bOEJoj9Ol3sxsiq18hfniqW1ATBEGc8=";
|
||||
sha256 = "sha256-W0iGE1yVOphooiab689AFT3rhGGdXqEFyYIhrx11RTE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -4,12 +4,12 @@
|
||||
|
||||
with python3Packages; buildPythonApplication rec {
|
||||
pname = "synadm";
|
||||
version = "0.34";
|
||||
version = "0.35";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-pM1nY8j7W1aeWv7/H+9Sz9jo4u1sax/fuKPtx0JKtL8=";
|
||||
sha256 = "sha256-fZAlQF2n93w69I1+dwfLnoh1O+uNHYNe0/1dRQgIpX4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -20,6 +20,7 @@ with python3Packages; buildPythonApplication rec {
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
click-option-group
|
||||
dnspython
|
||||
tabulate
|
||||
pyyaml
|
||||
requests
|
||||
|
@ -13,6 +13,10 @@ python3Packages.buildPythonApplication rec {
|
||||
sha256 = "sha256-e6euOtvJx+xUq5pWmWK6l7nv/twOa+0OABUTYvMd8Ow=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./unwrap-subprocess.patch
|
||||
];
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
mock
|
||||
python-snappy
|
||||
|
30
pkgs/tools/misc/barman/unwrap-subprocess.patch
Normal file
30
pkgs/tools/misc/barman/unwrap-subprocess.patch
Normal file
@ -0,0 +1,30 @@
|
||||
--- a/barman/command_wrappers.py
|
||||
+++ b/barman/command_wrappers.py
|
||||
@@ -1144,5 +1144,5 @@
|
||||
# * pass the current configuration file with -c
|
||||
# * set it quiet with -q
|
||||
- self.command = [sys.executable, command, "-c", config, "-q", subcommand]
|
||||
+ self.command = [command, "-c", config, "-q", subcommand]
|
||||
self.keep_descriptors = keep_descriptors
|
||||
# Handle args for the sub-command (like the server name)
|
||||
|
||||
--- a/tests/test_command_wrappers.py
|
||||
+++ a/tests/test_command_wrappers.py
|
||||
@@ -1595,5 +1595,4 @@
|
||||
)
|
||||
assert subprocess.command == [
|
||||
- sys.executable,
|
||||
sys.argv[0],
|
||||
"-c",
|
||||
@@ -1622,5 +1621,4 @@
|
||||
)
|
||||
assert subprocess.command == [
|
||||
- sys.executable,
|
||||
"path/to/barman",
|
||||
"-c",
|
||||
@@ -1644,5 +1642,4 @@
|
||||
|
||||
command = [
|
||||
- sys.executable,
|
||||
"path/to/barman",
|
||||
"-c",
|
@ -5,14 +5,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trillian";
|
||||
version = "1.4.2";
|
||||
vendorSha256 = "sha256-/5IBb/cYY6o49WmG7LmLZ4AwOjZ54Uy9bALb1pn0qGo=";
|
||||
version = "1.5.0";
|
||||
vendorSha256 = "sha256-235uQK4E/GLl5XLBd6lkTIgWIjT9MZZGnyfZbOoTFo0=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7R/E9BXPla90Q7LEOtLBMz2LKok7gsAnXrfJ1E8urf4=";
|
||||
sha256 = "sha256-XZHVGuIN+5mFbaxOprhdHlpgz2NE2NsJxGWJciDMUqI=";
|
||||
};
|
||||
|
||||
subPackages = [
|
||||
|
@ -696,6 +696,8 @@ in {
|
||||
|
||||
aria2p = callPackage ../development/python-modules/aria2p { };
|
||||
|
||||
arnparse = callPackage ../development/python-modules/arnparse { };
|
||||
|
||||
arrayqueues = callPackage ../development/python-modules/arrayqueues { };
|
||||
|
||||
arris-tg2492lg = callPackage ../development/python-modules/arris-tg2492lg { };
|
||||
|
Loading…
Reference in New Issue
Block a user