Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
commit
76b76719e7
|
@ -9,11 +9,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "msmtp";
|
||||
version = "1.8.19";
|
||||
version = "1.8.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-NKHhmBF2h02+TuZu4NkQPJCYmqTc3Ehh5N4Fzn5EUms=";
|
||||
sha256 = "sha256-2TriqvwPSK99ydCzlN8buABYi4tOjQltizzyJTROsRE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -21,15 +21,16 @@ index bdb4fb8..1363a67 100755
|
|||
#[ -x "$MSMTP" ] || \
|
||||
# log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit
|
||||
##
|
||||
@@ -70,9 +70,8 @@ MSMTP=msmtp
|
||||
@@ -70,9 +70,9 @@ MSMTP=msmtp
|
||||
## ( chmod 0700 msmtp.queue )
|
||||
##
|
||||
## the queue dir - modify this to reflect where you'd like it to be (no quotes !!)
|
||||
-Q=~/.msmtp.queue
|
||||
-[ -d "$Q" ] || \
|
||||
- err '' "msmtpq : can't find msmtp queue directory [ $Q ]" '' # if not present - complain ; quit
|
||||
-[ -d "$Q" ] || mkdir -m 0700 "$Q" || \
|
||||
- err '' "msmtpq : can't find or create msmtp queue directory [ $Q ]" '' # if not present - complain ; quit
|
||||
+Q=${MSMTP_QUEUE:-~/.msmtp.queue}
|
||||
+test -d "$Q" || mkdir -p "$Q"
|
||||
+[ -d "$Q" ] || mkdir -m 0700 -p "$Q" || \
|
||||
+ err '' "msmtpq : can't find or create msmtp queue directory [ $Q ]" '' # if not present - complain ; quit
|
||||
##
|
||||
## set the queue log file var to the location of the msmtp queue log file
|
||||
## where it is or where you'd like it to be
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clojure";
|
||||
version = "1.11.1.1124";
|
||||
version = "1.11.1.1129";
|
||||
|
||||
src = fetchurl {
|
||||
# https://clojure.org/releases/tools
|
||||
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
|
||||
sha256 = "sha256-QucUcLCzLPe/OpVyI8++Z+RFukNNRQ39imBaxZuH324=";
|
||||
sha256 = "sha256-kib1gGN4krlvEuCGdAYV3ejaMXOIhJ7ZBaUO4ulc6SQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "kcolorpicker";
|
||||
version = "0.1.6";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ksnip";
|
||||
repo = "kColorPicker";
|
||||
rev = "v${version}";
|
||||
sha256 = "1167xwk75yiz697vddbz3lq42l7ckhyl2cvigy4m05qgg9693ksd";
|
||||
sha256 = "sha256-ahmMj/yzQiRP9oJwDuhJGxe849kxNsoGFDZ2CGQNhKs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "kimageannotator";
|
||||
version = "0.5.3";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ksnip";
|
||||
repo = "kImageAnnotator";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dkZa+OhU3w4dUy/Edd0R2UFNYuIdeYe3H1SOtW5ario=";
|
||||
sha256 = "sha256-fWMaat5IguEZwoEJiEjGrWIbOqdJhs25qOebxpWVQQk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake qttools ];
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
, buildPythonPackage
|
||||
, docutils
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, imaplib2
|
||||
, mock
|
||||
, nose
|
||||
|
@ -19,9 +20,7 @@ buildPythonPackage rec {
|
|||
version = "0.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
# Check https://github.com/bamthomas/aioimaplib/issues/75
|
||||
# for Python 3.10 support
|
||||
disabled = pythonOlder "3.5" || pythonAtLeast "3.10";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bamthomas";
|
||||
|
@ -30,6 +29,14 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-xxZAeJDuqrPv4kGgDr0ypFuZJk1zcs/bmgeEzI0jpqY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/bamthomas/aioimaplib/pull/76
|
||||
(fetchpatch {
|
||||
url = "https://github.com/bamthomas/aioimaplib/commit/03f796f45b60a163ad0f3d52166d58f280de7065.patch";
|
||||
hash = "sha256-9staxkw/EfGoBz/uyrNKBvQ0KfN+za4rTGRyqrAJSd8=";
|
||||
})
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
asynctest
|
||||
docutils
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-doctor";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "thegeeklab";
|
||||
repo = "ansible-doctor";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lJKJE9UccknQg8aqt/6qmjKKaICBxaCH5e8fdmie6u8=";
|
||||
hash = "sha256-onRur31Sa95nsXUYFJdAHySm4nIXqP01nT70IFPwLCo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -56,7 +56,7 @@ buildPythonPackage rec {
|
|||
--replace 'Jinja2 = "3.1.2"' 'Jinja2 = "*"' \
|
||||
--replace 'anyconfig = "0.13.0"' 'anyconfig = "*"' \
|
||||
--replace 'environs = "9.5.0"' 'environs = "*"' \
|
||||
--replace 'jsonschema = "4.4.0"' 'jsonschema = "*"' \
|
||||
--replace 'jsonschema = "4.6.0"' 'jsonschema = "*"' \
|
||||
--replace '"ruamel.yaml" = "0.17.21"' '"ruamel.yaml" = "*"'
|
||||
'';
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bond-async";
|
||||
version = "0.1.20";
|
||||
version = "0.1.22";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
@ -19,8 +19,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "bondhome";
|
||||
repo = "bond-async";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iBtbHS3VzSB6wfWDFq5UVd3++x3HtQbWQ6soPYfcHiM=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-wU1niuzHwNmrmyjcTlBIKrBf1wMbHHFlIBxFNHUwDw4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
, fetchFromGitHub
|
||||
, protobuf
|
||||
, pythonOlder
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -29,6 +30,12 @@ buildPythonPackage rec {
|
|||
# 10.12. The patch reverts
|
||||
# https://github.com/mysql/mysql-connector-python/commit/d1e89fd3d7391084cdf35b0806cb5d2a4b413654
|
||||
./0001-Revert-Fix-MacOS-wheels-platform-tag.patch
|
||||
|
||||
# Allow for clang to be used to build native extensions
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mysql/mysql-connector-python/commit/fd24ce9dc8c60cc446a8e69458f7851d047c7831.patch";
|
||||
sha256 = "sha256-WvU1iB53MavCsksKCjGvUl7R3Ww/38alxxMVzjpr5Xg=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -44,7 +51,6 @@ buildPythonPackage rec {
|
|||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "A MySQL driver";
|
||||
longDescription = ''
|
||||
A MySQL driver that does not depend on MySQL C client libraries and
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "0.4.7";
|
||||
version = "1.0.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-DEK8vOWHv+O6zpzluUkhozsihhM9Ad2lOCEf4YnT+Yk=";
|
||||
hash = "sha256-cY2+H6FiojUEOHuA+wuIubtJKjNQlgten1edWgkoLb0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
41
pkgs/development/python-modules/pycketcasts/default.nix
Normal file
41
pkgs/development/python-modules/pycketcasts/default.nix
Normal file
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, python-magic
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycketcasts";
|
||||
version = "1.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwithan8";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-O4j89fE7fYPthhCH8b2gGskkelEA4mU6GvSbKIl+4Mk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python-magic
|
||||
requests
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pycketcasts"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to interact with PocketCast's unofficial API";
|
||||
homepage = "https://github.com/nwithan8/pycketcasts";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ssh-mitm";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -25,8 +25,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-TU+jrPZtE9SasUudg1BujvIi3uH+WRdW2TReTFYtntc=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-F7+odIWiEy7Aea+Jnx5VuDv5PdMlvxX975QmlLQ5APE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
38
pkgs/development/python-modules/ultraheat-api/default.nix
Normal file
38
pkgs/development/python-modules/ultraheat-api/default.nix
Normal file
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pyserial
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ultraheat-api";
|
||||
version = "0.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "ultraheat_api";
|
||||
inherit version;
|
||||
hash = "sha256-J0mQolWdXatIG/ORTBNyo6HrAfydvYqXK7LxInQWcX0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyserial
|
||||
];
|
||||
|
||||
# Source is not tagged, only PyPI releases
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ultraheat_api"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module for working with data from Landis+Gyr Ultraheat heat meter unit";
|
||||
homepage = "https://github.com/vpathuis/uh50";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "unicrypto";
|
||||
version = "0.0.7";
|
||||
version = "0.0.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vGapqRrXkcQJK8plFSup2UmBhlRnFkeLPhXwBtgQyOs=";
|
||||
hash = "sha256-BIf53ZAJwybulTGnlBKuGK1nNCWhyADWSUe5b96wTN8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zwave-js-server-python";
|
||||
version = "0.37.1";
|
||||
version = "0.37.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -18,8 +18,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ciIodpa1ekOqC6wa4r3qxJKW1gzTdoRqeLLaTW/yJQs=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-3Cn/8BbxcOFv8zDdRC91/8EWH6hTuXhtu5Yk8EOhGH4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -2053,7 +2053,8 @@
|
|||
"plum_lightpad" = ps: with ps; [
|
||||
]; # missing inputs: plumlightpad
|
||||
"pocketcasts" = ps: with ps; [
|
||||
]; # missing inputs: pycketcasts
|
||||
pycketcasts
|
||||
];
|
||||
"point" = ps: with ps; [
|
||||
aiohttp-cors
|
||||
pypoint
|
||||
|
|
|
@ -6558,6 +6558,8 @@ in {
|
|||
|
||||
pyatome = callPackage ../development/python-modules/pyatome { };
|
||||
|
||||
pycketcasts = callPackage ../development/python-modules/pycketcasts { };
|
||||
|
||||
pycontrol4 = callPackage ../development/python-modules/pycontrol4 { };
|
||||
|
||||
pycoolmasternet-async = callPackage ../development/python-modules/pycoolmasternet-async { };
|
||||
|
@ -10814,6 +10816,8 @@ in {
|
|||
|
||||
ukrainealarm = callPackage ../development/python-modules/ukrainealarm { };
|
||||
|
||||
ultraheat-api = callPackage ../development/python-modules/ultraheat-api { };
|
||||
|
||||
umalqurra = callPackage ../development/python-modules/umalqurra { };
|
||||
|
||||
umap-learn = callPackage ../development/python-modules/umap-learn { };
|
||||
|
|
Loading…
Reference in a new issue