Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-01-15 06:40:38 +00:00 committed by GitHub
commit 83c50873f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 170 additions and 24 deletions

View file

@ -144,7 +144,7 @@ in
};
masterAuth = mkOption {
type = types.str;
type = with types; nullOr str;
default = null;
description = ''If the master is password protected (using the requirePass configuration)
it is possible to tell the slave to authenticate before starting the replication synchronization

View file

@ -18,7 +18,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
testScript = with pkgs.dockerTools; ''
unix_time_second1 = "1970-01-01T00:00:01Z"
docker.wait_for_unit("sockets.target")
docker.wait_for_unit("docker.service")
with subtest("Ensure Docker images use a stable date by default"):
docker.succeed(

View file

@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
testScript = ''
start_all()
docker.wait_for_unit("sockets.target")
docker.wait_for_unit("docker.service")
docker.succeed("tar cv --files-from /dev/null | docker import - scratchimg")
docker.succeed(
"docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "conmon";
version = "2.0.22";
version = "2.0.24";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "07wd3pns6x25dcnc1r84cwmrzg8xgzsfmidkclcpcagf97ad7jmc";
sha256 = "1z6z1bz2rgj15xbqx10kvwn8s64nx5hmn1x52k4z4r20p4f95hkg";
};
nativeBuildInputs = [ pkg-config ];

View file

@ -120,7 +120,7 @@ rec {
export GOPATH=$(pwd)
export GOCACHE="$TMPDIR/go-cache"
mkdir -p src/github.com/docker/docker/pkg
ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum
ln -sT ${docker.moby.src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum
go build
mkdir -p $out/bin

View file

@ -0,0 +1,37 @@
{ stdenv, fetchzip, gnome3, gettext, glib }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-clock-override";
version = "12";
src = fetchzip {
url = "https://extensions.gnome.org/extension-data/clock-overridegnomeshell.kryogenix.org.v${version}.shell-extension.zip";
sha256 = "1cyaszks6bwnbgacqsl1pmr24mbj05mad59d4253la9am8ibb4m6";
stripRoot = false;
};
uuid = "clock-override@gnomeshell.kryogenix.org";
nativeBuildInputs = [ gettext glib ];
buildPhase = ''
runHook preBuild
glib-compile-schemas --strict --targetdir=schemas schemas
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions/${uuid}
cp -r {convenience.js,extension.js,format.js,locale,metadata.json,prefs.js,schemas} $out/share/gnome-shell/extensions/${uuid}
runHook postInstall
'';
meta = with stdenv.lib; {
description = "Customize the date and time format displayed in clock in the top bar in GNOME Shell";
license = licenses.mit;
maintainers = with maintainers; [ rhoriguchi ];
homepage = "https://github.com/stuartlangridge/gnome-shell-clock-override";
broken = versionOlder gnome3.gnome-shell.version "3.18";
};
}

View file

@ -55,6 +55,7 @@ let
configureFlags = [
"--with-boot-jdk=${openjdk14-bootstrap.home}"
"--with-version-pre="
"--enable-unlimited-crypto"
"--with-native-debug-symbols=internal"
"--with-libjpeg=system"

View file

@ -55,6 +55,7 @@ let
configureFlags = [
"--with-boot-jdk=${openjdk15-bootstrap.home}"
"--with-version-pre="
"--enable-unlimited-crypto"
"--with-native-debug-symbols=internal"
"--with-libjpeg=system"

View file

@ -4,20 +4,13 @@
buildPythonPackage rec {
pname = "aiohttp_remotes";
version = "0.1.2";
version = "1.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "43c3f7e1c5ba27f29fb4dbde5d43b900b5b5fc7e37bf7e35e6eaedabaec4a3fc";
sha256 = "1vv2ancxsaxlls9sinigjnrqyx95n7cphq37m8nwifkhvs0idv6a";
};
patches = [
(fetchpatch {
url = "https://github.com/aio-libs/aiohttp-remotes/commit/188772abcea038c31dae7d607e487eeed44391bc.patch";
sha256 = "0pb1y4jb8ar1szhnjiyj2sdmdk6z9h6c3wrxw59nv9kr3if5igvs";
})
];
propagatedBuildInputs = [ aiohttp ];
checkInputs = [ pytest pytestcov pytest-aiohttp ];

View file

@ -0,0 +1,45 @@
{ lib
, aiohttp
, asynctest
, buildPythonPackage
, fetchFromGitHub
, poetry
, pytest-aiohttp
, pytest-asyncio
, pytest-sugar
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "aioswitcher";
version = "1.2.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "TomerFi";
repo = pname;
rev = version;
sha256 = "0wvca1jbyj4bwrpkpklbxnkvdp9zs7mrvg5b9vkx2hpyr81vyxam";
};
nativeBuildInputs = [ poetry ];
propagatedBuildInputs = [ aiohttp ];
checkInputs = [
asynctest
pytest-aiohttp
pytest-asyncio
pytest-sugar
pytestCheckHook
];
pythonImportsCheck = [ "aioswitcher" ];
meta = with lib; {
description = "Python module to interact with Switcher water heater";
homepage = "https://github.com/TomerFi/aioswitcher";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -18,7 +18,6 @@
buildPythonPackage rec {
pname = "azure-identity";
version = "1.5.0";
disabled = isPy38;
src = fetchPypi {
inherit pname version;
@ -38,11 +37,6 @@ buildPythonPackage rec {
msrestazure
];
prePatch = ''
substituteInPlace setup.py \
--replace msal-extensions~=0.1.3 msal-extensions
'';
pythonImportsCheck = [ "azure.identity" ];
# Requires checkout from mono-repo and a mock account:

View file

@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, click
, fetchFromGitHub
, mock
, pytest-runner
, pytestCheckHook
, requests
, websocket_client
}:
buildPythonPackage rec {
pname = "orvibo";
version = "1.1.1";
src = fetchFromGitHub {
owner = "happyleavesaoc";
repo = "python-orvibo";
rev = version;
sha256 = "042prd5yxqvlfija7ii1xn424iv1p7ndhxv6m67ij8cbvspwx356";
};
# Project as no tests
doCheck = false;
pythonImportsCheck = [ "orvibo" ];
meta = with lib; {
description = "Python client to work with Orvibo devices";
homepage = "https://github.com/happyleavesaoc/python-orvibo";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,35 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pyyaml
}:
buildPythonPackage rec {
pname = "pyvlx";
version = "0.2.19";
src = fetchFromGitHub {
owner = "Julius2342";
repo = pname;
rev = version;
sha256 = "031gp3sjagvmgdhfpdqlawva425ja1n3bmxk6jyn4zx54szj9zwf";
};
propagatedBuildInputs = [ pyyaml ];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "pyvlx" ];
meta = with lib; {
description = "Python client to work with Velux units";
longDescription = ''
PyVLX uses the Velux KLF 200 interface to control io-Homecontrol
devices, e.g. Velux Windows.
'';
homepage = "https://github.com/Julius2342/pyvlx";
license = with licenses; [ lgpl2Only ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -594,7 +594,7 @@
"opple" = ps: with ps; [ ]; # missing inputs: pyoppleio
"orangepi_gpio" = ps: with ps; [ ]; # missing inputs: OPi.GPIO
"oru" = ps: with ps; [ ]; # missing inputs: oru
"orvibo" = ps: with ps; [ ]; # missing inputs: orvibo
"orvibo" = ps: with ps; [ orvibo ];
"osramlightify" = ps: with ps; [ ]; # missing inputs: lightify
"otp" = ps: with ps; [ pyotp ];
"ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy
@ -799,7 +799,7 @@
"swisscom" = ps: with ps; [ ];
"switch" = ps: with ps; [ ];
"switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot
"switcher_kis" = ps: with ps; [ ]; # missing inputs: aioswitcher
"switcher_kis" = ps: with ps; [ aioswitcher ];
"switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate
"syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru url-normalize
"synology" = ps: with ps; [ ]; # missing inputs: py-synology
@ -892,7 +892,7 @@
"vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api
"vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp
"velbus" = ps: with ps; [ ]; # missing inputs: python-velbus
"velux" = ps: with ps; [ ]; # missing inputs: pyvlx
"velux" = ps: with ps; [ pyvlx ];
"venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch
"vera" = ps: with ps; [ pyvera ];
"verisure" = ps: with ps; [ jsonpath ]; # missing inputs: vsure

View file

@ -27007,6 +27007,7 @@ in
arc-menu = callPackage ../desktops/gnome-3/extensions/arc-menu { };
caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { };
clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { };
clock-override = callPackage ../desktops/gnome-3/extensions/clock-override { };
dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { };
dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { };
draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { };

View file

@ -272,6 +272,8 @@ in {
aiostream = callPackage ../development/python-modules/aiostream { };
aioswitcher = callPackage ../development/python-modules/aioswitcher { };
aiounifi = callPackage ../development/python-modules/aiounifi { };
aiounittest = callPackage ../development/python-modules/aiounittest { };
@ -4505,6 +4507,8 @@ in {
ortools = (toPythonModule (pkgs.or-tools.override { inherit (self) python; })).python;
orvibo = callPackage ../development/python-modules/orvibo { };
osc = callPackage ../development/python-modules/osc { };
oscrypto = callPackage ../development/python-modules/oscrypto { };
@ -6378,6 +6382,8 @@ in {
inherit (pkgs) pkg-config vips glib;
};
pyvlx = callPackage ../development/python-modules/pyvlx { };
pyvmomi = callPackage ../development/python-modules/pyvmomi { };
pyvoro = callPackage ../development/python-modules/pyvoro { };