b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-05-14 06:22:26 +00:00 committed by GitHub
parent bf5d8bb531 210784b7c8
commit bfb5f4cc5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 93 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/radio/gnuradio/wrapper.nix
View file

@ -4,7 +4,7 @@
, unwrapped
# If it's a minimal build, we don't want to wrap it with lndir and
# wrapProgram..
, wrap ? true
, doWrap ? true
# For the wrapper
, makeWrapper
# For lndir
@ -138,7 +138,7 @@ let
;
pkgs = packages;
};
self = if wrap then
self = if doWrap then
stdenv.mkDerivation {
inherit name passthru;
buildInputs = [

6
pkgs/development/python-modules/accuweather/default.nix
View file

@ -11,20 +11,20 @@
buildPythonPackage rec {
pname = "accuweather";
version = "0.1.1";
version = "0.2.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = version;
sha256 = "sha256-fjOwa13hxY8/gCM6TCAFWVmEY1oZyqKyc6o3OSsxHpY=";
sha256 = "sha256-Swe8vegRcyaeG4n/8aeGFLrXkwcLM/Al53yD6oD/0GA=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "pytest-runner" ""
substituteInPlace pytest.ini \
substituteInPlace setup.cfg \
--replace "--cov --cov-report term-missing" ""
'';

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyhaversion";
version = "21.3.0";
version = "21.5.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-2vW4BN5qwJZYQ8FU3bpSA2v1dX6TOhcHDbHRMDPoRAs=";
sha256 = "sha256-/F4UMFUs60o3QazfFYEWgTGHg4z5knzNWolUpk5SIeM=";
};
propagatedBuildInputs = [

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

@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "pymodbus";
version = "2.5.1";
version = "2.5.2";
src = fetchFromGitHub {
owner = "riptideio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-b85jfBZfMZtqtmID+tGBgOe9o0BbmBH83UV71lYAI5c=";
sha256 = "sha256-jqVfBAjIdRBB5AYd0ZkMi7qAUR6vSYeBI4OYEv+mKwE=";
};
# Twisted asynchronous version is not supported due to a missing dependency

18
pkgs/development/python-modules/pysonos/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pysonos";
version = "0.0.45";
version = "0.0.46";
disabled = !isPy3k;
@ -23,10 +23,14 @@ buildPythonPackage rec {
owner = "amelchio";
repo = pname;
rev = "v${version}";
sha256 = "0wzmrd9ja5makvsgf0ckil99wr8vw91dml8fi9miiq4la0100q0n";
sha256 = "sha256-5vQBSKDgzwdWkyGduq2cWa7Eq5l01gbs236H2Syc/Dc=";
};
propagatedBuildInputs = [ ifaddr requests xmltodict ];
propagatedBuildInputs = [
ifaddr
requests
xmltodict
];
checkInputs = [
pytestCheckHook
@ -38,10 +42,10 @@ buildPythonPackage rec {
"test_desc_from_uri" # test requires network access
];
meta = {
homepage = "https://github.com/amelchio/pysonos";
meta = with lib; {
description = "A SoCo fork with fixes for Home Assistant";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ juaningan ];
homepage = "https://github.com/amelchio/pysonos";
license = licenses.mit;
maintainers = with maintainers; [ juaningan ];
};
}

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

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "pyvesync";
version = "1.3.1";
version = "1.4.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "02fpbyg46mlpc2c1j4zylw9a1h6bacxvigrl3cndsf6fxlhfx15z";
sha256 = "sha256-xvHvZx22orJR94cRMyyXey27Ksh2/ULHRvv7xxXv11k=";
};
propagatedBuildInputs = [ requests ];

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

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "xknx";
version = "0.18.1";
version = "0.18.2";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "XKNX";
repo = pname;
rev = version;
sha256 = "sha256-Zf7Od3v54LxMofm67XHeRM4Yeg1+KQLRhFl1BihAxGc=";
sha256 = "sha256-7jfZtncjcYaAS/7N06FWXh4qSTH6y+VdFx3kKyQxIbM=";
};
propagatedBuildInputs = [

31
pkgs/misc/emulators/rpcs3/default.nix
View file

@ -1,23 +1,26 @@
{ mkDerivation, lib, fetchgit, cmake, pkg-config, git
{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config, git
, qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng
, ffmpeg, libevdev, python3
, ffmpeg, libevdev, libusb1, zlib, curl, python3
, sdl2Support ? true, SDL2
, pulseaudioSupport ? true, libpulseaudio
, waylandSupport ? true, wayland
, alsaSupport ? true, alsaLib
}:
let
majorVersion = "0.0.12";
gitVersion = "10811-a86a3d2fe"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
majorVersion = "0.0.16";
gitVersion = "12235-a4f4b81e6"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
in
mkDerivation {
pname = "rpcs3";
version = "${majorVersion}-${gitVersion}";
src = fetchgit {
url = "https://github.com/RPCS3/rpcs3";
rev = "v${majorVersion}";
sha256 = "182rkmbnnlcfzam4bwas7lwv10vqiqvvaw3299a3hariacd7rq8x";
src = fetchFromGitHub {
owner = "RPCS3";
repo = "rpcs3";
rev = "a4f4b81e6b0c00f4c30f9f5f182e5fe56f9fb03c";
fetchSubmodules = true;
sha256 = "1d70nljl1kmpbk50jpjki7dglw1bbxd7x4qzg6nz5np2sdsbpckd";
};
preConfigure = ''
@ -30,8 +33,13 @@ mkDerivation {
'';
cmakeFlags = [
"-DUSE_SYSTEM_ZLIB=ON"
"-DUSE_SYSTEM_LIBUSB=ON"
"-DUSE_SYSTEM_LIBPNG=ON"
"-DUSE_SYSTEM_FFMPEG=ON"
"-DUSE_SYSTEM_CURL=ON"
# NB: Can't use this yet, our CMake doesn't include FindWolfSSL.cmake
#"-DUSE_SYSTEM_WOLFSSL=ON"
"-DUSE_NATIVE_INSTRUCTIONS=OFF"
];
@ -39,8 +47,9 @@ mkDerivation {
buildInputs = [
qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg
libevdev python3
] ++ lib.optional pulseaudioSupport libpulseaudio
libevdev zlib libusb1 curl python3
] ++ lib.optional sdl2Support SDL2
++ lib.optional pulseaudioSupport libpulseaudio
++ lib.optional alsaSupport alsaLib
++ lib.optional waylandSupport wayland;
@ -48,7 +57,7 @@ mkDerivation {
description = "PS3 emulator/debugger";
homepage = "https://rpcs3.net/";
maintainers = with maintainers; [ abbradar neonfuz ilian ];
license = licenses.gpl2;
license = licenses.gpl2Only;
platforms = [ "x86_64-linux" ];
};
}

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

@ -397,6 +397,8 @@ in with py.pkgs; buildPythonApplication rec {
"uptime"
"vacuum"
"verisure"
"version"
"vesync"
"weather"
"webhook"
"websocket_api"
@ -411,6 +413,8 @@ in with py.pkgs; buildPythonApplication rec {
"zone"
"zwave"
"zwave_js"
] ++ lib.optionals (builtins.any (s: s == stdenv.hostPlatform.system) debugpy.meta.platforms) [
"debugpy"
];
pytestFlagsArray = [

6
pkgs/tools/audio/beets/default.nix
View file

@ -105,13 +105,13 @@ in pythonPackages.buildPythonApplication rec {
# unstable does not require bs1770gain[2].
# [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639
# [2]: https://github.com/NixOS/nixpkgs/pull/90504
version = "unstable-2021-04-17";
version = "unstable-2021-05-13";
src = fetchFromGitHub {
owner = "beetbox";
repo = "beets";
rev = "50163b373f527d1b1f8b2442240ca547e846744e";
sha256 = "sha256-l7drav4Qx2JCF+F5OA0s641idcKM3S4Yx2lM2evJQWE=";
rev = "1faa41f8c558d3f4415e5e48cf4513d50b466d34";
sha256 = "sha256-P0bV7WNqCYe9+3lqnFmAoRlb2asdsBUjzRMc24RngpU=";
};
propagatedBuildInputs = [

36
pkgs/tools/text/wrap/default.nix Normal file
View file

@ -0,0 +1,36 @@
{ lib, buildGoModule, fetchFromGitHub, fetchpatch, makeWrapper, courier-prime }:
buildGoModule rec {
pname = "wrap";
version = "0.3.1";
src = fetchFromGitHub {
owner = "Wraparound";
repo = "wrap";
rev = "v${version}";
sha256 = "0scf7v83p40r9k7k5v41rwiy9yyanfv3jm6jxs9bspxpywgjrk77";
};
nativeBuildInputs = [ makeWrapper ];
vendorSha256 = "03q5a5lm8zj1523gxkbc0y6a3mjj1z2h7nrr2qcz8nlghvp4cfaz";
patches = [
(fetchpatch {
name = "courier-prime-variants.patch";
url = "https://github.com/Wraparound/wrap/commit/b72c280b6eddba9ec7b3507c1f143eb28a85c9c1.patch";
sha256 = "1d9v0agfd7mgd17k4a8l6vr2kyswyfsyq3933dz56pgs5d3jric5";
})
];
postInstall = ''
wrapProgram $out/bin/wrap --prefix XDG_DATA_DIRS : ${courier-prime}/share/
'';
meta = with lib; {
description = "A Fountain export tool with some extras";
homepage = "https://github.com/Wraparound/wrap";
license = licenses.gpl3Only;
maintainers = [ maintainers.austinbutler ];
};
}

10
pkgs/top-level/all-packages.nix
View file

@ -9699,6 +9699,8 @@ in
wpgtk = callPackage ../tools/X11/wpgtk { };
wrap = callPackage ../tools/text/wrap { };
wring = nodePackages.wring;
wrk = callPackage ../tools/networking/wrk { };
@ -23178,7 +23180,7 @@ in
# A build without gui components and other utilites not needed for end user
# libraries
gnuradioMinimal = gnuradio.override {
wrap = false;
doWrap = false;
unwrapped = gnuradio.unwrapped.override {
volk = volk.override {
# So it will not reference python
@ -23208,7 +23210,7 @@ in
# A build without gui components and other utilites not needed if gnuradio is
# used as a c++ library.
gnuradio3_8Minimal = gnuradio3_8.override {
wrap = false;
doWrap = false;
unwrapped = gnuradio3_8.unwrapped.override {
volk = volk.override {
enableModTool = false;
@ -23237,7 +23239,7 @@ in
# A build without gui components and other utilites not needed if gnuradio is
# used as a c++ library.
gnuradio3_7Minimal = gnuradio3_7.override {
wrap = false;
doWrap = false;
unwrapped = gnuradio3_7.unwrapped.override {
volk = volk.override {
enableModTool = false;
@ -25972,7 +25974,7 @@ in
rootlesskit = callPackage ../tools/virtualization/rootlesskit {};
rpcs3 = libsForQt514.callPackage ../misc/emulators/rpcs3 { };
rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { };
rsclock = callPackage ../applications/misc/rsclock { };