forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
86e1706582
|
|
@ -13,10 +13,10 @@ let
|
|||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1kbjbqb03yapz7067q589gaa7d6cqaipj7hmp1l3nh0bmggzsc4c";
|
||||
x86_64-darwin = "1qgadm52c5lzkvgvqrz0n8brm4qbjg8hf1dk6a2ynqhqjxcwbj4r";
|
||||
aarch64-linux = "0i3yl9rx9h7qkl3k9qk6gg35nhz737qzzbvzvdwkqjaacsbpfgf8";
|
||||
armv7l-linux = "19iz2bxcq6y8sklr6zcnbp47kki9l00x3nvr213lkk3kj08l0afv";
|
||||
x86_64-linux = "07wbh4sfvnmvif1a03z8bbqrjmcwmb4q5nn3l2r738i9wrxdxjja";
|
||||
x86_64-darwin = "0djcx4n17giynckhsqqx8q7j25cxd3xqgjz3jhh8xh54h4fbvmbz";
|
||||
aarch64-linux = "172x6c2pl994ps4xbrgrkzdb02gmpqag61sbxc7796cx0xk8bjpi";
|
||||
armv7l-linux = "008bf7iwfizbn67wl1cxahl6h7pg04ms4q2nmr0dndcpxgc1q5gd";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
|
|
@ -25,7 +25,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.52.1";
|
||||
version = "1.53.0";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
|
|
|||
|
|
@ -4,16 +4,6 @@
|
|||
, pulseaudio }:
|
||||
|
||||
let
|
||||
sha256 = {
|
||||
x86_64-linux = "19751ygq1ng79aniqx91qawc0cw07cwdjdjd88azc9ww6z6nv0mp";
|
||||
i386-linux = "0dwc7v4p1dz51444zwn0kds23yi87r4h2d3isfj9xwkn90pxb7in";
|
||||
}.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported");
|
||||
|
||||
arch = {
|
||||
x86_64-linux = "amd64";
|
||||
i386-linux = "i386";
|
||||
}.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported");
|
||||
|
||||
description = "Desktop sharing application, providing remote support and online meetings";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
|
@ -28,14 +18,14 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "anydesk";
|
||||
version = "6.0.1";
|
||||
version = "6.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download.anydesk.com/linux/${pname}-${version}-${arch}.tar.gz"
|
||||
"https://download.anydesk.com/linux/generic-linux/${pname}-${version}-${arch}.tar.gz"
|
||||
"https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz"
|
||||
"https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz"
|
||||
];
|
||||
inherit sha256;
|
||||
sha256 = "1qbq6r0yanjappsi8yglw8r54bwf32bjb2i63awmr6pk5kmhhy3r";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -83,7 +73,7 @@ in stdenv.mkDerivation rec {
|
|||
inherit description;
|
||||
homepage = "https://www.anydesk.com";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ shyim ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
version = "2.28.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "aa272605fd8a2ddcc6e5dd8151d628f76a9468c97ba7e4e315d6bc78b9bfb8f8";
|
||||
sha256 = "b22d500f674c084cefd73acd233fe12b816c8446f1da3cff58d7876477b862a3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "awesomeversion";
|
||||
version = "21.2.0";
|
||||
version = "21.2.2";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1rzd0mcxdjnnzg35hvdvacwrr9brwmkw9bwlb5x6bcp24ry9yl0q";
|
||||
sha256 = "1yl09csypa64nhsw7dc6kj8iybm1wkhfzylyfyq8b7jpwdx7ql31";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,40 +1,46 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, requests
|
||||
, fetchFromGitHub
|
||||
, certifi
|
||||
, click
|
||||
, keyring
|
||||
, keyrings-alt
|
||||
, click
|
||||
, pytz
|
||||
, requests
|
||||
, six
|
||||
, tzlocal
|
||||
, certifi
|
||||
, bitstring
|
||||
, unittest2
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, future
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyicloud";
|
||||
version = "0.9.7";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "dcebb32e474bc28aa77b944a0a64949ef3b5b852cbef6256fbc95347a04e777c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "picklepete";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0bxbhvimwbj2jm8dg7sil8yvln17xgjhvpwr4m783vwfcf76kdmy";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
certifi
|
||||
click
|
||||
future
|
||||
keyring
|
||||
keyrings-alt
|
||||
click
|
||||
pytz
|
||||
requests
|
||||
six
|
||||
tzlocal
|
||||
certifi
|
||||
bitstring
|
||||
future
|
||||
];
|
||||
|
||||
checkInputs = [ unittest2 ];
|
||||
checkInputs = [
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i \
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c
|
||||
index f795181..fb4926a 100644
|
||||
--- a/dlls/crypt32/rootstore.c
|
||||
+++ b/dlls/crypt32/rootstore.c
|
||||
@@ -18,6 +18,7 @@
|
||||
#include "config.h"
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
+#include <stdlib.h> /* getenv */
|
||||
#include <sys/types.h>
|
||||
#ifdef HAVE_SYS_STAT_H
|
||||
#include <sys/stat.h>
|
||||
@@ -916,6 +917,11 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store)
|
||||
|
||||
for (i = 0; !ret && i < ARRAY_SIZE(CRYPT_knownLocations); i++)
|
||||
ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE);
|
||||
+
|
||||
+ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE");
|
||||
+ if (nix_cert_file != NULL)
|
||||
+ ret = import_certs_from_path(nix_cert_file, from, TRUE);
|
||||
+
|
||||
check_and_store_certs(from, store);
|
||||
}
|
||||
CertCloseStore(from, 0);
|
||||
|
|
@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}:
|
|||
in rec {
|
||||
|
||||
stable = fetchurl rec {
|
||||
version = "5.0.3";
|
||||
url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-nBo1Ni/VE9/1yEW/dtpj6hBaeUrHFEqlA/cTYa820i8=";
|
||||
version = "6.0";
|
||||
url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-tJMGXy+D7kKcYuLsWGmKPPY+94ci4bIHZYIxUuhYLFY=";
|
||||
|
||||
## see http://wiki.winehq.org/Gecko
|
||||
gecko32 = fetchurl rec {
|
||||
|
|
@ -38,15 +38,15 @@ in rec {
|
|||
|
||||
patches = [
|
||||
# Also look for root certificates at $NIX_SSL_CERT_FILE
|
||||
./cert-path-stable.patch
|
||||
./cert-path.patch
|
||||
];
|
||||
};
|
||||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the SHA256 for staging as well.
|
||||
version = "6.0-rc4";
|
||||
url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-ndeBORgnfYmtPbvZEesaetocknePF8cnyjqfulkcfsU=";
|
||||
version = "6.1";
|
||||
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-qSwkMIxIuFG13CKh01aWpXMRxEezHsn6VD7FsKpzoUk=";
|
||||
inherit (stable) mono gecko32 gecko64;
|
||||
|
||||
patches = [
|
||||
|
|
@ -58,7 +58,7 @@ in rec {
|
|||
staging = fetchFromGitHub rec {
|
||||
# https://github.com/wine-staging/wine-staging/releases
|
||||
inherit (unstable) version;
|
||||
sha256 = "sha256-GdFiCGnGSDOxGERlfsPMJdSrQTvnx8gf4z4joqIKT7c=";
|
||||
sha256 = "sha256-uu6wvWT54Zvp86KfUcKepGxjQ6JHRQ7Yuu4yeROdHeo=";
|
||||
owner = "wine-staging";
|
||||
repo = "wine-staging";
|
||||
rev = "v${version}";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2021.2.0";
|
||||
version = "2021.2.1";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ let
|
|||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2021.2.0";
|
||||
hassVersion = "2021.2.1";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
|
@ -75,7 +75,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
sha256 = "116aq683wy7sxdbxr43li90irpfbsz0dv8w0r1fghcjpwlj7ihwa";
|
||||
sha256 = "0a8l23n6j0x1hjcifajgbrip7b4l8xcgxn2wa1lcg27p1cghrv5m";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
|
@ -100,6 +100,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
astral
|
||||
async-timeout
|
||||
attrs
|
||||
awesomeversion
|
||||
bcrypt
|
||||
certifi
|
||||
ciso8601
|
||||
|
|
@ -180,30 +181,23 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
|
||||
pytestFlagsArray = [
|
||||
"-n auto"
|
||||
# assign tests grouped by file to workers
|
||||
"--dist loadfile"
|
||||
# don't bulk test all components
|
||||
"--ignore tests/components"
|
||||
# prone to race conditions due to parallel file access
|
||||
"--ignore tests/test_config.py"
|
||||
# pyotp since v2.4.0 complains about the short mock keys, hass pins v2.3.0
|
||||
"--ignore tests/auth/mfa_modules/test_notify.py"
|
||||
"tests"
|
||||
] ++ map (component: "tests/components/" + component) componentTests;
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError: assert 'unknown' == 'not_home'
|
||||
"test_device_tracker_not_home"
|
||||
# AssertionError: assert 1 == 0
|
||||
"test_merge"
|
||||
# ModuleNotFoundError: No module named 'pyqwikswitch'
|
||||
"test_merge_id_schema"
|
||||
# keyring.errors.NoKeyringError: No recommended backend was available.
|
||||
"test_secrets_from_unrelated_fails"
|
||||
"test_secrets_credstash"
|
||||
# AssertionError: Expected 'start' to have been called once. Called 0 times.
|
||||
"test_setup_and_stop"
|
||||
# AssertionError: assert {} == {'test': <ANY...ckage': <ANY>}
|
||||
"test_get_custom_components_internal"
|
||||
# assert 0 == 1 where 0 = len([])
|
||||
"test_error_posted_as_event"
|
||||
# RuntimeError: Event loop is closed
|
||||
"test_config_path"
|
||||
"test_info_endpoint_register_callback_timeout"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
|
|
|||
Loading…
Reference in a new issue