alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-06-20 00:07:48 +00:00 committed by GitHub
parent b936df67cb d8a76e3dc1
commit 93800ee816
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 156 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/cluster/terragrunt/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.30.6";
version = "0.30.7";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-McV04oE8/LaH9lOU0aKsmS1KpWUC9I/t59WqAYZrIVY=";
sha256 = "sha256-zcb2bdIvUeHEto2NeY0Zwj7jIB+ipVXpnb7q97IkvmA=";
};
vendorSha256 = "sha256-OgNNq1qRhCufcWemLxh50pzs432RxZpWWcyBB7xeiOs=";

2
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View file

@ -335,7 +335,7 @@ stdenv.mkDerivation rec {
attrPath = "thunderbird-78";
baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
inherit writeScript lib common-updater-scripts xidel coreutils gnused
gnugrep curl runtimeShell;
gnugrep gnupg curl runtimeShell;
};
requiredSystemFeatures = [ "big-parallel" ];

8
pkgs/desktops/gnome/extensions/system-monitor/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-system-monitor";
version = "unstable-2021-05-04";
version = "unstable-2021-06-19";
src = fetchFromGitHub {
owner = "paradoxxxzero";
repo = "gnome-shell-system-monitor-applet";
rev = "bc38ccf49ac0ffae0fc0436f3c2579fc86949f10";
sha256 = "0yb5sb2xv4m18a24h4daahnxgnlmbfa0rfzic0zs082qv1kfi5h8";
rev = "bece7be22352b81d3d81e64e18a385812851b8de";
sha256 = "08nnsg7z3cqk25hfgy4wm02hd2wpz13kig498kn4mf5f1q4hslmx";
};
buildInputs = [
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./paths_and_nonexisting_dirs.patch;
clutter_path = gnome.mutter.libdir; # this should not be used in settings but 🤷‍♀️
clutter_path = gnome.mutter.libdir; # only needed for GNOME < 40.
gtop_path = "${libgtop}/lib/girepository-1.0";
glib_net_path = "${glib-networking}/lib/girepository-1.0";
})

4
pkgs/development/python-modules/aiosmb/default.nix
View file

@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "aiosmb";
version = "0.2.44";
version = "0.2.48";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-xNdrOO0BqV4sD6U39G2RXihDBBf516x8RLiqNLnZyWk=";
sha256 = "1b5bqpl8wbs0nm6025wlz4n5sns6ca1x6kgw9wx227flwf3qjlgm";
};
propagatedBuildInputs = [

63
pkgs/development/python-modules/pyhiveapi/default.nix Normal file
View file

@ -0,0 +1,63 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, unasync
, boto3
, botocore
, requests
, aiohttp
, pyquery
, loguru
}:
buildPythonPackage rec {
pname = "pyhiveapi";
version = "0.4.2";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Pyhass";
repo = "Pyhiveapi";
rev = "v${version}";
sha256 = "0x9cfxfdpccz360azpyfhvn09xxkw7vxy42npgbqhpy2g6mh5sif";
};
postPatch = ''
substituteInPlace requirements.txt \
--replace "pre-commit" ""
'';
nativeBuildInputs = [
unasync
];
propagatedBuildInputs = [
boto3
botocore
requests
aiohttp
pyquery
loguru
];
# tests are not functional yet
doCheck = false;
postBuild = ''
# pyhiveapi accesses $HOME upon importing
export HOME=$TMPDIR
'';
pythonImportsCheck = [ "pyhiveapi" ];
meta = with lib; {
description = "Python library to interface with the Hive API";
homepage = "https://github.com/Pyhass/Pyhiveapi";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

4
pkgs/development/python-modules/pymfy/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pymfy";
version = "0.10.1";
version = "0.11.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tetienne";
repo = "somfy-open-api";
rev = "v${version}";
sha256 = "sha256-xX7vNBQaYPdnsukFcQyEa2G1XIvf9ehADNXbLUUCRoU=";
sha256 = "0wpjwjmywfyqgwvfa5kwcjpaljc32qa088kk88nl9nqdvc31mzhv";
};
nativeBuildInputs = [ poetry-core ];

4
pkgs/development/python-modules/python-gitlab/default.nix
View file

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "python-gitlab";
version = "2.7.1";
version = "2.8.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "0z4amj5xhx5zc3h2m0zrkardm3z5ba9qpjx5n6dczyz77r527yg1";
sha256 = "0081jgjgqi4mqpr436ivw2q571hxi3hv2pa8d0z0nfl13s6lldpk";
};
propagatedBuildInputs = [

9
pkgs/development/python-modules/restfly/default.nix
View file

@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "restfly";
version = "1.3.5";
version = "1.4.0";
src = fetchFromGitHub {
owner = "stevemcgrath";
repo = pname;
rev = version;
sha256 = "0cq07wj6g3kg7i4qyjp3n3pv13k9p4p43rd6kn139wsn1mh8fr56";
sha256 = "0cmx15i57cxqw7naz8nkpqjckd6lpd2vszrkl82hvnajdimcd9wy";
};
propagatedBuildInputs = [
@ -32,6 +32,11 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = [
# Test requires network access
"test_session_ssl_error"
];
pythonImportsCheck = [ "restfly" ];
meta = with lib; {

45
pkgs/development/python-modules/unasync/default.nix Normal file
View file

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "unasync";
version = "0.5.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "python-trio";
repo = "unasync";
rev = "v${version}";
sha256 = "0h86i09v4909a8nk5lp36jlwz6rsln6vyg3d0i13ykxa6lrx1c2l";
};
propagatedBuildInputs = [
setuptools
];
checkInputs = [
pytestCheckHook
];
disabledTests = [
# mess with $PYTHONPATH
"test_build_py_modules"
"test_build_py_packages"
"test_project_structure_after_build_py_packages"
"test_project_structure_after_customized_build_py_packages"
];
pythonImportsCheck = [ "unasync" ];
meta = with lib; {
description = "Project that can transform your asynchronous code into synchronous code";
homepage = "https://github.com/python-trio/unasync";
license = with licenses; [ mit /* or */ asl20 ];
maintainers = with maintainers; [ dotlambda ];
};
}

5
pkgs/development/python-modules/xknx/default.nix
View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "xknx";
version = "0.18.5";
version = "0.18.7";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "XKNX";
repo = pname;
rev = version;
sha256 = "sha256-hvLfcrN1NFKM2YezvMLSTNZtwpThEnT7eRUnVzbrK0Q=";
sha256 = "17w6a4ci4w6ggxpa99197f84awd116ygzd3fa5cvn1a7221dvdj4";
};
propagatedBuildInputs = [
@ -43,5 +43,6 @@ buildPythonPackage rec {
homepage = "https://github.com/XKNX/xknx";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
platforms = platforms.linux;
};
}

6
pkgs/os-specific/linux/kernel/linux-xanmod.nix
View file

@ -1,18 +1,18 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
version = "5.12.11";
version = "5.12.12";
suffix = "xanmod1-cacule";
in
buildLinux (args // rec {
modDirVersion = "${version}-${suffix}";
inherit version;
modDirVersion = "${version}-${suffix}";
src = fetchFromGitHub {
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
sha256 = "sha256-EQ52Leg7i1Xb2b29JbaKFKRE/jKXB48GXhbM/Ay5QTY=";
sha256 = "sha256-99gVqdYhnBx3MDTCCHbxsljmvi+DixHp19vtNwCRM/M=";
};
extraMeta = {

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

@ -352,7 +352,7 @@
"history" = ps: with ps; [ aiohttp-cors sqlalchemy ];
"history_stats" = ps: with ps; [ sqlalchemy ];
"hitron_coda" = ps: with ps; [ ];
"hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi
"hive" = ps: with ps; [ pyhiveapi ];
"hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16
"home_connect" = ps: with ps; [ aiohttp-cors homeconnect ];
"home_plus_control" = ps: with ps; [ aiohttp-cors homepluscontrol ];

1
pkgs/servers/home-assistant/default.nix
View file

@ -443,6 +443,7 @@ in with py.pkgs; buildPythonApplication rec {
"heos"
"history"
"history_stats"
"hive"
"home_connect"
"home_plus_control"
"homeassistant"

10
pkgs/servers/web-apps/searx/default.nix
View file

@ -1,4 +1,4 @@
{ lib, nixosTests, python3, python3Packages, fetchFromGitHub }:
{ lib, nixosTests, python3, python3Packages, fetchFromGitHub, fetchpatch }:
with python3Packages;
@ -14,6 +14,14 @@ toPythonModule (buildPythonApplication rec {
sha256 = "0ghkx8g8jnh8yd46p4mlbjn2zm12nx27v7qflr4c8xhlgi0px0mh";
};
patches = [
# Fix a crash, remove with the next update
(fetchpatch {
url = "https://github.com/searx/searx/commit/9c10b150963babb7f0b52081693a42b2e61eede9.patch";
sha256 = "0svp8799628wja2hq59da6rxqi99am8p6hb8y27ciwzsjz0wwba7";
})
];
postPatch = ''
sed -i 's/==.*$//' requirements.txt
'';

4
pkgs/shells/zsh/zsh-powerlevel10k/default.nix
View file

@ -7,13 +7,13 @@ let
# match gitstatus version with given `gitstatus_version`:
# https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info
gitstatus = pkgs.gitstatus.overrideAttrs (oldAtttrs: rec {
version = "1.3.1";
version = "1.5.1";
src = fetchFromGitHub {
owner = "romkatv";
repo = "gitstatus";
rev = "v${version}";
sha256 = "03zaywncds7pjrl07rvdf3fh39gnp2zfvgsf0afqwv317sgmgpzf";
sha256 = "1ffgh5826985phc8amvzl9iydvsnij5brh4gczfh201vfmw9d4hh";
};
});
in

4
pkgs/tools/security/snallygaster/default.nix
View file

@ -5,13 +5,13 @@
python3Packages.buildPythonApplication rec {
pname = "snallygaster";
version = "0.0.9";
version = "0.0.10";
src = fetchFromGitHub {
owner = "hannob";
repo = pname;
rev = "v${version}";
sha256 = "1gan5asgrxdgfi9lalhxzj3vs7nkazi8nqia36bpz1qb5fz7jrx3";
sha256 = "1xd483sl94zhs7yhc52s0zrn3pj7vf5izggp4ap1d2j0lbwwcyka";
};
propagatedBuildInputs = with python3Packages; [

6
pkgs/tools/typesetting/tectonic/default.nix
View file

@ -3,17 +3,17 @@
rustPlatform.buildRustPackage rec {
pname = "tectonic";
version = "0.5.2";
version = "0.6.4";
src = fetchFromGitHub {
owner = "tectonic-typesetting";
repo = "tectonic";
rev = "tectonic@${version}";
fetchSubmodules = true;
sha256 = "sha256-JQ78N+cfk1D6xZixoUvYiLP6ZwovBn/ro1CZoutBwp8=";
sha256 = "11q0vwgjlailkw4l9z7r54wkxi8dwh40pm7bd74dcvm0x4323fpd";
};
cargoSha256 = "sha256-disJme0UM6U+yWjGsPya0xDvW6iQsipqMkEALeJ99xU=";
cargoSha256 = "1drfgrsfz44yqz15bcmb3dyyz7dr9zbs3idl1ssaiir24d4z1m9z";
nativeBuildInputs = [ pkg-config ];

4
pkgs/top-level/python-packages.nix
View file

@ -5268,6 +5268,8 @@ in {
pyheos = callPackage ../development/python-modules/pyheos { };
pyhiveapi = callPackage ../development/python-modules/pyhiveapi { };
pynndescent = callPackage ../development/python-modules/pynndescent { };
pynobo = callPackage ../development/python-modules/pynobo { };
@ -8742,6 +8744,8 @@ in {
u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { };
unasync = callPackage ../development/python-modules/unasync { };
uncertainties = callPackage ../development/python-modules/uncertainties { };
uncompyle6 = callPackage ../development/python-modules/uncompyle6 { };