Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-06-29 18:04:14 +00:00 committed by GitHub
commit fc76765e6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 578 additions and 439 deletions

View file

@ -38,11 +38,11 @@ in
default = pkgs.linuxPackages;
type = types.unspecified // { merge = mergeEqualOption; };
apply = kernelPackages: kernelPackages.extend (self: super: {
kernel = super.kernel.override {
kernel = super.kernel.override (originalArgs: {
inherit randstructSeed;
kernelPatches = super.kernel.kernelPatches ++ kernelPatches;
kernelPatches = (originalArgs.kernelPatches or []) ++ kernelPatches;
features = lib.recursiveUpdate super.kernel.features features;
};
});
});
# We don't want to evaluate all of linuxPackages for the manual
# - some of it might not even evaluate correctly.

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "freac";
version = "1.1.4";
version = "1.1.5";
src = fetchFromGitHub {
owner = "enzo1982";
repo = "freac";
rev = "v${version}";
sha256 = "sha256-JwZJOV4mxNKqhhdlfFcX06NwBxmbye2mgMfdM//bHYI=";
sha256 = "sha256-cRmN9D/+FLiXqZW/PYhw61EoZuL3y61YtQ/ZNjnhfmY=";
};
buildInputs = [

View file

@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
ffversion = "89.0.1";
ffversion = "89.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "67da387b3b6c5a110c83208f9a15d6064adf423bbebfb0fcad2d85f6c4b615b27da0cbd5486b817f0d5e040bc3e70d74d9af72599b24384397fef1dd153bd3f3";
sha512 = "ffd98ab0887611c5b4aba68346c49a7a31a58150fd8bbae610a4d941c4cff0acef0daaebfbb577787a759b4c1ef3c1199f02681148612f4f5b709983e07e0ccb";
};
meta = {

View file

@ -19,13 +19,13 @@ let
in
buildGoModule rec {
pname = "argo";
version = "3.0.7";
version = "3.0.8";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
sha256 = "sha256-lZTSUNtmJZKONt0Bv42dBAc+87L14HaPxvPxhFe8nyc=";
sha256 = "sha256-TOPJvOQKEMEsQ/wAJNF+08g4z75GGkNom6gRCrNOO2I=";
};
vendorSha256 = "sha256-YjVAoMyGKMHLGEPeOOkCKCzeWFiUsXfJIKcw5GYoljg=";

View file

@ -21,14 +21,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.21.1";
version = "0.21.2";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
sha256 = "sha256-/+OSVjC4++A4kaxEfI2kIgjXxL67lfoXCdH2PykLWxA=";
sha256 = "0y0mg8rr18mn0wzym7v48x6kl0ixd5q387kr5jhbdln55ph2jk9d";
};
buildInputs = [

View file

@ -15,13 +15,13 @@
buildGoModule rec {
pname = "cri-o";
version = "1.21.0";
version = "1.21.1";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
sha256 = "sha256-qhS1RLkM7xDsH3qDVL+ORXmwULYz8UK1oJM29oRqJ0M=";
sha256 = "sha256-WoQeZkHuCQGv//UKTpvucJXq7xI9Fkil8V1B1qTM75k=";
};
vendorSha256 = null;

View file

@ -46,6 +46,10 @@ if stdenv.isLinux then
extraInstallCommands = ''
mv $out/bin/$name $out/bin/arduino-cli
'';
targetPkgs = pkgs: with pkgs; [
zlib
];
}
else
pkg

View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "BoCA";
version = "1.0.4";
version = "1.0.5";
src = fetchFromGitHub {
owner = "enzo1982";
repo = "boca";
rev = "v${version}";
sha256 = "sha256-SP/rVt/8VoeUprwJIIMSIBvoC1Zein3F7MR2tqc2vd0=";
sha256 = "sha256-ooLPpwTxG7QBAGhEGhta4T06ZDWlPysocHbb/Sq7Wyo=";
};
nativeBuildInputs = [

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "smooth";
version = "0.9.6";
version = "0.9.8";
src = fetchFromGitHub {
owner = "enzo1982";
repo = "smooth";
rev = "v${version}";
sha256 = "05j5gk6kz2089x8bcq2l0kjspfiiymxn69jcxl4dh9lw96blbadr";
sha256 = "sha256-4092Od/wCWe4br80Ry6mr8GpUIUeeF6sk3unELdfQJU=";
};
nativeBuildInputs = [

View file

@ -1,32 +1,24 @@
{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, ounit, qcheck
{ lib, fetchurl, ocaml, buildDunePackage, ounit, qtest
# Optionally enable tests; test script use OCaml-4.01+ features
, doCheck ? lib.versionAtLeast (lib.getVersion ocaml) "4.01"
, doCheck ? lib.versionAtLeast ocaml.version "4.04"
}:
let version = "1.4.3"; in
let version = "1.6.0"; in
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-stringext-${version}";
src = fetchzip {
url = "https://github.com/rgrinberg/stringext/archive/v${version}.tar.gz";
sha256 = "121k79vjazvsd254yg391fp4spsd1p32amccrahd0g6hjhf5w6sl";
buildDunePackage {
pname = "stringext";
version = version;
useDune2 = true;
src = fetchurl {
url = "https://github.com/rgrinberg/stringext/releases/download/${version}/stringext-${version}.tbz";
sha256 = "1sh6nafi3i9773j5mlwwz3kxfzdjzsfqj2qibxhigawy5vazahfv";
};
buildInputs = [ ocaml findlib ocamlbuild ounit qcheck ];
configurePhase = "ocaml setup.ml -configure --prefix $out"
+ lib.optionalString doCheck " --enable-tests";
buildPhase = "ocaml setup.ml -build";
checkInputs = [ ounit qtest ];
inherit doCheck;
checkPhase = "ocaml setup.ml -test";
installPhase = "ocaml setup.ml -install";
createFindlibDestdir = true;
meta = {
homepage = "https://github.com/rgrinberg/stringext";
platforms = ocaml.meta.platforms or [];
description = "Extra string functions for OCaml";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ vbgl ];

View file

@ -0,0 +1,55 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, geopy
, imageio
, pillow
, pytestCheckHook
, python-dateutil
}:
buildPythonPackage rec {
pname = "env-canada";
version = "0.4.0";
src = fetchFromGitHub {
owner = "michaeldavie";
repo = "env_canada";
rev = "v${version}";
sha256 = "0y4yjzmg6ns7a13j1cxqvrff4fd6k97cpc1xjwqrwp7gq49rzhy7";
};
propagatedBuildInputs = [
aiohttp
geopy
imageio
pillow
python-dateutil
];
checkInputs = [
pytestCheckHook
];
disabledTests = [
# Tests require network access
"test_get_aqhi_regions"
"test_update"
"test_get_hydro_sites"
"test_echydro"
"test_get_dimensions"
"test_get_latest_frame"
"test_get_loop"
"test_get_ec_sites"
];
pythonImportsCheck = [ "env_canada" ];
meta = with lib; {
description = "Python library to get Environment Canada weather data";
homepage = "https://github.com/michaeldavie/env_canada";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -8,7 +8,6 @@
, mock
, pytestCheckHook
, pytest-mock
, pytestcov
}:
buildPythonPackage rec {
@ -30,12 +29,20 @@ buildPythonPackage rec {
})
];
postPatch = ''
sed -i "/--cov/d" setup.cfg
'';
# Fontconfig error: Cannot load default config file
FONTCONFIG_FILE = makeFontsConf {
fontDirectories = [ freefont_ttf ];
};
checkInputs = [ mock pytestCheckHook pytest-mock pytestcov ];
checkInputs = [ mock pytestCheckHook pytest-mock ];
preCheck = ''
export HOME=$TMPDIR
'';
meta = with lib; {
description = "Simple Python interface for Graphviz";

View file

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
, aiohttp
}:
buildPythonPackage rec {
pname = "smarthab";
version = "0.21";
src = fetchPypi {
pname = "SmartHab";
inherit version;
sha256 = "bf929455a2f7cc1e275b331de73d983587138a8d9179574988ba05fa152d3ccf";
};
propagatedBuildInputs = [
aiohttp
];
# no tests on PyPI, no tags on GitLab
doCheck = false;
pythonImportsCheck = [ "pysmarthab" ];
meta = with lib; {
description = "Control devices in a SmartHab-powered home";
homepage = "https://gitlab.com/outadoc/python-smarthab";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, aiohttp
, yarl
, aresponses
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "sonarr";
version = "0.3.0";
src = fetchFromGitHub {
owner = "ctalkington";
repo = "python-sonarr";
rev = version;
sha256 = "0gi34951qhzzrq59hj93mnkid8cvvknlamkhir6ya9mb23fr7bya";
};
propagatedBuildInputs = [
aiohttp
yarl
];
checkInputs = [
aresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "sonarr" ];
meta = with lib; {
description = "Asynchronous Python client for the Sonarr API";
homepage = "https://github.com/ctalkington/python-sonarr";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kustomize-sops";
version = "2.5.6";
version = "2.5.7";
src = fetchFromGitHub {
owner = "viaduct-ai";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UEtWEOuekFbMUJFWYdXfzbCWCz4I7vVdb9UBQbMXF/A=";
sha256 = "sha256-CtVFCpj6YZUAjeyRAPOkbd30Js1PSmzapB12SwKZisc=";
};
vendorSha256 = "sha256-kNJkSivSj8LMeXobKazLy9MCTtWzrBn99GmvaH+qIUU=";

View file

@ -70,7 +70,7 @@ stdenv.mkDerivation {
# indeed GHC will refuse to compile with a binutils suffering from it. See
# this comment for more information:
# https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333
lib.optional stdenv.targetPlatform.isAarch32 ./R_ARM_COPY.patch;
lib.optional (stdenv.targetPlatform.isAarch32 && stdenv.hostPlatform.system != stdenv.targetPlatform.system) ./R_ARM_COPY.patch;
outputs = [ "out" "info" "man" ];

View file

@ -27,7 +27,7 @@ in buildLinux (args // {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1z8jgsq5fkg486xxawg4c4wk1l9xra7x1cfqaf4grhw0csbbx883";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
}; in [ rt-patch ] ++ kernelPatches;
structuredExtraConfig = with lib.kernel; {
PREEMPT_RT = yes;

View file

@ -27,7 +27,7 @@ in buildLinux (args // {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1az6cn9jj3bnjgwzzrjy1adnrnn06p2vzsnc1iib4xhs0sfr27hc";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
}; in [ rt-patch ] ++ kernelPatches;
structuredExtraConfig = with lib.kernel; {
PREEMPT_RT = yes;

View file

@ -23,7 +23,7 @@ in buildLinux (args // {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1m1mnmk7h35p7dv6mg3pla6pw3b645hbbccjmp1jc3fyn6qiy6fq";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
}; in [ rt-patch ] ++ kernelPatches;
structuredExtraConfig = with lib.kernel; {
PREEMPT_RT = yes;

View file

@ -228,7 +228,7 @@
"enocean" = ps: with ps; [ enocean ];
"enphase_envoy" = ps: with ps; [ envoy-reader ];
"entur_public_transport" = ps: with ps; [ enturclient ];
"environment_canada" = ps: with ps; [ ]; # missing inputs: env_canada
"environment_canada" = ps: with ps; [ env-canada ];
"envirophat" = ps: with ps; [ smbus-cffi ]; # missing inputs: envirophat
"envisalink" = ps: with ps; [ pyenvisalink ];
"ephember" = ps: with ps; [ ]; # missing inputs: pyephember
@ -768,7 +768,7 @@
"sma" = ps: with ps; [ pysma ];
"smappee" = ps: with ps; [ aiohttp-cors pysmappee ];
"smart_meter_texas" = ps: with ps; [ ]; # missing inputs: smart-meter-texas
"smarthab" = ps: with ps; [ ]; # missing inputs: smarthab
"smarthab" = ps: with ps; [ smarthab ];
"smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa pysmartapp pysmartthings ];
"smarttub" = ps: with ps; [ python-smarttub ];
"smarty" = ps: with ps; [ ]; # missing inputs: pysmarty
@ -786,7 +786,7 @@
"soma" = ps: with ps; [ pysoma ];
"somfy" = ps: with ps; [ aiohttp-cors pymfy ];
"somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy
"sonarr" = ps: with ps; [ ]; # missing inputs: sonarr
"sonarr" = ps: with ps; [ sonarr ];
"songpal" = ps: with ps; [ python-songpal ];
"sonos" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ];
"sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp

View file

@ -657,6 +657,7 @@ in with py.pkgs; buildPythonApplication rec {
"sleepiq"
"sma"
"smappee"
"smarthab"
"smartthings"
"smarttub"
"smhi"
@ -665,6 +666,7 @@ in with py.pkgs; buildPythonApplication rec {
"solaredge"
"soma"
"somfy"
"sonarr"
"songpal"
"sonos"
"soundtouch"

View file

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "macchina";
version = "0.8.21";
version = "0.9.2";
src = fetchFromGitHub {
owner = "Macchina-CLI";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cwQCqKC/onEZ4i533NSHrnNAl8/sRivK/ItX8oqB86Q=";
sha256 = "sha256:0d6nqjn2828kk91430yjl6xlwx1j10xhp2i0vv2slm3wv0a4w24x";
};
cargoSha256 = "sha256-W29k2eLcYTqVn0v1dJrvFLRcWuVMsoHD+vPDL7YkiWE=";
cargoSha256 = "sha256:0mjqqd43jj6hxicgjkvmdf966vj5xf0ndibszzwp38zdb5kzshqi";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];

View file

@ -2307,6 +2307,8 @@ in {
enum-compat = callPackage ../development/python-modules/enum-compat { };
env-canada = callPackage ../development/python-modules/env-canada { };
envisage = callPackage ../development/python-modules/envisage { };
envs = callPackage ../development/python-modules/envs { };
@ -7986,6 +7988,8 @@ in {
smart-open = callPackage ../development/python-modules/smart-open { };
smarthab = callPackage ../development/python-modules/smarthab { };
smartypants = callPackage ../development/python-modules/smartypants { };
smbprotocol = callPackage ../development/python-modules/smbprotocol { };
@ -8056,6 +8060,8 @@ in {
somecomfort = callPackage ../development/python-modules/somecomfort { };
sonarr = callPackage ../development/python-modules/sonarr { };
sopel = callPackage ../development/python-modules/sopel { };
sorl_thumbnail = callPackage ../development/python-modules/sorl_thumbnail { };