JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-24 00:01:30 +00:00 committed by GitHub
commit 680bd8fbaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 728 additions and 676 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
View File

@ -2885,10 +2885,10 @@
elpaBuild {
pname = "pyim";
ename = "pyim";
version = "3.9.2";
version = "3.9.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/pyim-3.9.2.tar";
sha256 = "18m5wni1zns8fad2ll9flbfgxfy14gi03apnycajdbqxsqfp65j9";
url = "https://elpa.gnu.org/packages/pyim-3.9.3.tar";
sha256 = "0rjaimvbh0fadbqiq4ggyxr0y4pfzld76wb64v7l5874qczn8dfr";
};
packageRequires = [ async emacs xr ];
meta = {

12
pkgs/applications/editors/emacs/elisp-packages/org-generated.nix
View File

@ -4,10 +4,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "20210712";
version = "20210719";
src = fetchurl {
url = "https://orgmode.org/elpa/org-20210712.tar";
sha256 = "0xdxzfk7hvsmlyivn61ivci6hy2alxg2ysdm5xad4xxz337jrj7x";
url = "https://orgmode.org/elpa/org-20210719.tar";
sha256 = "1aravj0krdi8bnfinfj1d92vq3g06djxcnpipibkrw9ggk0d01d6";
};
packageRequires = [];
meta = {
@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
version = "20210712";
version = "20210719";
src = fetchurl {
url = "https://orgmode.org/elpa/org-plus-contrib-20210712.tar";
sha256 = "1cdpwsfjmjplyik1r9kl4lvd5lm52zrixlfg2ml1mhh28s680k0q";
url = "https://orgmode.org/elpa/org-plus-contrib-20210719.tar";
sha256 = "1knjkf365cnjd8sdhaisjx0n6n0l2zfpql1b2gzw0gj62kbpl476";
};
packageRequires = [];
meta = {

1211
pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
View File

File diff suppressed because it is too large Load Diff

4
pkgs/development/interpreters/erlang/R24.nix
View File

@ -3,6 +3,6 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
version = "24.0.3";
sha256 = "KVMISrWNBkk+w37gB4M5TQkgm4odZ+GqLvKN4stzOUI=";
version = "24.0.4";
sha256 = "OeXXNaVJh5el+V+5ukcNOAgDmkJuGy1lYLpUTd1yxHM=";
}

4
pkgs/development/libraries/webkitgtk/default.nix
View File

@ -63,7 +63,7 @@ assert enableGeoLocation -> geoclue2 != null;
stdenv.mkDerivation rec {
pname = "webkitgtk";
version = "2.32.1";
version = "2.32.3";
outputs = [ "out" "dev" ];
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
sha256 = "05v9hgpkc6mi2klrd8nqql1n8xzq8rgdz3hvyy369xkhgwqifq8k";
sha256 = "sha256-wfSW9axlTv5M72L71PL77u8mWgfF50GeXSkAv+6lLLw=";
};
patches = lib.optionals stdenv.isLinux [

4
pkgs/development/python-modules/aioesphomeapi/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "4.1.0";
version = "5.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "0210l2d5g76pllr2vh990k9shfv3zrknx5d2dmgqb5y90142cp76";
sha256 = "sha256-2IxXhAysQiqqEd4Mfjgc5vX0+D60rof2nPJDXy9tRVs=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/aiohomekit/default.nix
View File

@ -1,5 +1,6 @@
{ lib
, buildPythonPackage
, commentjson
, cryptography
, fetchFromGitHub
, poetry-core
@ -11,14 +12,14 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "0.4.2";
version = "0.5.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "Jc2k";
repo = pname;
rev = version;
sha256 = "12v9szalh3yzfqgmspk4ch8l38kzmhwzjn9jvsq632n4zhjd7qg4";
sha256 = "sha256-Fo9KWBcN6Y/fa7vkWugSer5L7+hOWz99+hw6Hz1LAMM=";
};
nativeBuildInputs = [
@ -26,6 +27,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
commentjson
cryptography
zeroconf
];

4
pkgs/development/python-modules/aionotion/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aionotion";
version = "3.0.1";
version = "3.0.2";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "1ydrazg7gcwf53006n1fvxh9zm77by6zi36haq1bmy5skqccyiki";
sha256 = "1328g2245h9gcrnzrbcxaxw78723d0skznrrj8k77fbijxdc4kwv";
};
nativeBuildInputs = [ poetry-core ];

4
pkgs/development/python-modules/async-upnp-client/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "async-upnp-client";
version = "0.19.0";
version = "0.19.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "StevenLooman";
repo = "async_upnp_client";
rev = version;
sha256 = "0xj3j54nasl59gs1k84h3fixjsaqn7whg33h6wi99l5yfbwfqv8p";
sha256 = "sha256-qxEn9UrQuwRaP7sZlu3854gDI7Gqku055DF8KvsU6p4=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/backoff/default.nix
View File

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "backoff";
version = "1.10.0";
version = "1.11.1";
src = fetchFromGitHub {
owner = "litl";
repo = pname;
rev = "v${version}";
sha256 = "1jj0l6pjx747d2yyvnzd3qbm4qr73sq6cc56dhvd8wqfbp5279x0";
sha256 = "sha256-87IMcLaoCn0Vns8Ub/AFmv0gXtS0aPZX0cSt7+lOPm4=";
};
format = "pyproject";

4
pkgs/development/python-modules/pydeconz/default.nix
View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pydeconz";
version = "80";
version = "82";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Kane610";
repo = "deconz";
rev = "v${version}";
sha256 = "sha256-om1Nhqu2CU+W2k2PGP1+6jLRJihacSQDayOfTzblZKo=";
sha256 = "sha256-DdZ6bf+2rMjgjm5aRxcSRI/hN0zfP7uV8PaM40c9IJo=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyfireservicerota/default.nix
View File

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pyfireservicerota";
version = "0.0.40";
version = "0.0.43";
src = fetchPypi {
inherit pname version;
sha256 = "8d8173f6682ef2a61367660a15559c8c7a7e00db3f98092e0fa52e771df356f4";
sha256 = "sha256-3+QK1BVuWYii0oYT4xXMOYJZmVKrB4EmqE0EkdFlZvE=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyhaversion/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyhaversion";
version = "21.5.0";
version = "21.07.0";
# Only 3.8.0 and beyond are supported
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "sha256-/F4UMFUs60o3QazfFYEWgTGHg4z5knzNWolUpk5SIeM=";
sha256 = "sha256-LcuMLYekeK9HR+SR8+R+EvuxxaN3RCh7KV969RngZjw=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyinsteon/default.nix
View File

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "pyinsteon";
version = "1.0.11";
version = "1.0.12";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-dT01nKXDjkFSIf2BmrIcC8a9n00hlyd59oPwXn1CBaw=";
sha256 = "sha256-IlRCUogs78kbKY8gp22YzIkNrXhSCLJDDDtFAucrQxE=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pymazda/default.nix
View File

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "pymazda";
version = "0.1.6";
version = "0.2.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-fQcycOMNYCO6bP344DTLxNf/YoliEITyxsnIDyTPO5E=";
sha256 = "sha256-tEe70gvEglxqECiPjS3k29zZi70OSGMv6JxhrXqPhnY=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pysma/default.nix
View File

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pysma";
version = "0.6.2";
version = "0.6.4";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-nKnOWVPRFmylwUeb0yApMHdW8vGvPCLlOGkZGNYC128=";
sha256 = "sha256-hnvbQOilsoHn1qc/pKJ2Eq1VwJi+HbGlAAJwiME1Pgc=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pysonos/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pysonos";
version = "0.0.51";
version = "0.0.54";
disabled = !isPy3k;
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "amelchio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MjsbqrH4SWnnwGe9BVHaValoQEiaaZVhFdn6MDoEyZs=";
sha256 = "sha256-gBOknYHL5nQWFVhCbLN0Ah+1fovcNY4P2myryZnUadk=";
};
propagatedBuildInputs = [

15
pkgs/development/python-modules/pywemo/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, ifaddr
, lxml
, poetry-core
@ -14,7 +13,7 @@
buildPythonPackage rec {
pname = "pywemo";
version = "0.6.4";
version = "0.6.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,19 +21,13 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = version;
sha256 = "1hm1vs6m65vqar0lcjnynz0d9y9ri5s75fzhvp0yfjkcnp06gnfa";
sha256 = "sha256-8nLzNEle5eR5qc/tC1CX+Kh3WkPuKyy9VDMiAVbOykA=";
};
patches = [
(fetchpatch {
# https://github.com/pywemo/pywemo/issues/264
url = "https://github.com/pywemo/pywemo/commit/4fd7af8ccc7cb2412f61d5e04b79f83c9ca4753c.patch";
sha256 = "1x0rm5dxr0z5llmv446bx3i1wvgcfhx22zn78qblcr0m4yv3mif4";
})
nativeBuildInputs = [
poetry-core
];
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
ifaddr
requests

10
pkgs/development/python-modules/simplisafe-python/default.nix
View File

@ -1,7 +1,8 @@
{ lib
, aiohttp
, aresponses
, aioresponses
, asynctest
, backoff
, buildPythonPackage
, fetchFromGitHub
, poetry-core
@ -14,7 +15,7 @@
buildPythonPackage rec {
pname = "simplisafe-python";
version = "11.0.1";
version = "11.0.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,19 +23,20 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "04fn65iwzgvxi44kgvgvxjr3nzi2f4hwlqrjxfvc5yda96qp347c";
sha256 = "sha256-sIv7zoLp+1CfeyhVYWMp93TkNk+h14WawOJOQMhwAp8=";
};
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
aiohttp
backoff
pytz
voluptuous
];
checkInputs = [
aresponses
aioresponses
asynctest
pytest-asyncio
pytestCheckHook

4
pkgs/development/python-modules/zigpy/default.nix
View File

@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "zigpy";
version = "0.35.1";
version = "0.35.2";
src = fetchFromGitHub {
owner = "zigpy";
repo = "zigpy";
rev = version;
sha256 = "0y5sv8zzlkjwimknpld3fakl22cfkqv0cnw0immb7k4zb9xmls2v";
sha256 = "sha256-p0q0wGp3NaBO7gBTsPAt7FEAHW0MDPJCKqLklY21zBQ=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/zwave-js-server-python/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "zwave-js-server-python";
version = "0.27.0";
version = "0.27.1";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = version;
sha256 = "sha256-ClZ9B20NphN5XewqEtHpUMNHuuVxs1RJBcxWi6TzT1Y=";
sha256 = "sha256-Q02S0jEFZe4qOkRok/sY0UPrMpmD13off85UL3+8o/o=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/buildah/default.nix
View File

@ -14,13 +14,13 @@
buildGoModule rec {
pname = "buildah";
version = "1.21.3";
version = "1.21.4";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "sha256-f39UXQXUje6j8bRWVaX9ELCwO1vaeNuGnlmPhyyVoV8=";
sha256 = "sha256-eVXNkQJ3/T4KFiGeE8o4kFBOONfHc6v+tNEOsOnEYRA=";
};
outputs = [ "out" "man" ];

24
pkgs/misc/vscode-extensions/default.nix
View File

@ -1,4 +1,4 @@
{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck }:
{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck, moreutils, racket-minimal }:
let
inherit (vscode-utils) buildVscodeMarketplaceExtension;
@ -513,6 +513,28 @@ let
};
};
eugleo.magic-racket = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog";
description = "The best coding experience for Racket in VS Code ";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket";
homepage = "https://github.com/Eugleo/magic-raket";
license = licenses.agpl3Only;
};
mktplcRef = {
name = "magic-racket";
publisher = "evzen-wybitul";
version = "0.5.7";
sha256 = "sha256-34/H0WgM73yzuOGU2w6Ipq7KuEBuN1bykcLGuvzY3mU=";
};
nativeBuildInputs = [ jq moreutils ];
postInstall = ''
cd "$out/$installPrefix"
jq '.contributes.configuration.properties."magic-racket.general.racketPath".default = "${racket-minimal}/bin/racket"' package.json | sponge package.json
'';
};
file-icons.file-icons = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog";

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2021.7.0";
version = "2021.7.4";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];

17
pkgs/servers/home-assistant/default.nix
View File

@ -58,19 +58,6 @@ let
(mkOverride "ring-doorbell" "0.6.2"
"fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560")
# Pinned due to API changes in pyatv>=0.8.0
(self: super: {
pyatv = super.pyatv.overridePythonAttrs (olAttrs: rec {
version = "0.7.7";
src = fetchFromGitHub {
owner = "postlund";
repo = "pyatv";
rev = "v${version}";
sha256 = "sha256-dPnh8XZN7ZVR2rYNnj7GSYXW5I2GNQwD/KRDTgs2AtI=";
};
});
})
# Pinned due to API changes in pyflunearyou>=2.0
(self: super: {
pyflunearyou = super.pyflunearyou.overridePythonAttrs (oldAttrs: rec {
@ -170,7 +157,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2021.7.0";
hassVersion = "2021.7.4";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -187,7 +174,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "1dx1pmi0w265pyajmmvd7k6vb5z7s77a7b161zd0n4zsb989dil6";
sha256 = "1y6p3hg487ishar1r8vir5cxfbaw4c86s5w3zn9bmbf6jbd51pyk";
};
# leave this in, so users don't have to constantly update their downstream patch handling

6
pkgs/tools/audio/abcm2ps/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "abcm2ps";
version = "8.14.11";
version = "8.14.12";
src = fetchFromGitHub {
owner = "leesavide";
repo = "abcm2ps";
rev = "v${version}";
sha256 = "0lzzr2nkfg27gljcrdxkmli1wp08vap3vgxq1zgkv7f43rbm0qnw";
sha256 = "sha256-RELWtI+S2cbG7cXCehXymvWRdair28UaDZRVr5xt9Tk=";
};
configureFlags = [
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "http://moinejf.free.fr/";
license = licenses.gpl3;
license = licenses.lgpl3Plus;
description = "A command line program which converts ABC to music sheet in PostScript or SVG format";
platforms = platforms.unix;
maintainers = [ maintainers.dotlambda ];

4
pkgs/tools/backup/duplicity/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv
, fetchFromGitLab
, fetchpatch
, python38
, python3
, librsync
, ncftp
, gnupg
@ -13,7 +13,7 @@
, gettext
}:
let
pythonPackages = python38.pkgs;
pythonPackages = python3.pkgs;
inherit (lib.versions) majorMinor splitVersion;
majorMinorPatch = v: builtins.concatStringsSep "." (lib.take 3 (splitVersion v));
in

27
pkgs/tools/misc/trash-cli/default.nix
View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "trash-cli";
version = "0.21.6.30";
version = "0.21.7.23";
src = fetchFromGitHub {
owner = "andreafrancia";
repo = "trash-cli";
rev = version;
sha256 = "09vwg4jpx7pl7rd5ybq5ldgwky8zzf59msmzvmim9vipnmjgkxv7";
sha256 = "1kdkzs9mbyac8ndc6r0wa39z8d3fj8zglqp149id4j37aydxb10l";
};
propagatedBuildInputs = [ python3Packages.psutil ];
@ -18,8 +18,27 @@ python3Packages.buildPythonApplication rec {
pytestCheckHook
];
# Skip `test_user_specified` since its result depends on the mount path.
disabledTests = [ "test_user_specified" ];
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
# Create a home directory with a test file.
HOME="$(mktemp -d)"
touch "$HOME/deleteme"
# Verify that trash list is initially empty.
[[ $($out/bin/trash-list) == "" ]]
# Trash a test file and verify that it shows up in the list.
$out/bin/trash "$HOME/deleteme"
[[ $($out/bin/trash-list) == *" $HOME/deleteme" ]]
# Empty the trash and verify that it is empty.
$out/bin/trash-empty
[[ $($out/bin/trash-list) == "" ]]
runHook postInstallCheck
'';
meta = with lib; {
homepage = "https://github.com/andreafrancia/trash-cli";