From f4b90cf6d0bf5e300ba30ad5f2a6b34d92afb042 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Tue, 11 May 2021 12:39:53 +1000 Subject: [PATCH 01/13] rpcs3: 0.0.12-12199-b8477a470 -> 0.0.16-12235-a4f4b81e6 Additionally: * Use system libcurl, so the patch downloader can work * Use system zlib * Use system libusb * Add note about using system WolfSSL * Enable SDL2, so the FAudio backend can work * Change license to gpl2Only, as per [1] [1]: https://github.com/RPCS3/rpcs3/issues/10255#issuecomment-835512840 --- pkgs/misc/emulators/rpcs3/default.nix | 31 +++++++++++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index ecda439e7ab..8eab2f05720 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -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" ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 544d2f71825..ac58e20aa43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25863,7 +25863,7 @@ in rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; - rpcs3 = libsForQt514.callPackage ../misc/emulators/rpcs3 { }; + rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; rsclock = callPackage ../applications/misc/rsclock { }; From 6b788d75eca81400bf8f20dfbdb021ae2d290583 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 May 2021 21:36:12 +0200 Subject: [PATCH 02/13] python3Packages.pysonos: 0.0.45 -> 0.0.46 --- .../python-modules/pysonos/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index e4296a4f0b5..ec1e4a6c5c5 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -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 ]; }; } From 7c76b37743ecab8182de24f21c16ad5589142b05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 May 2021 23:07:42 +0200 Subject: [PATCH 03/13] python3Packages.accuweather: 0.1.1 -> 0.2.0 --- pkgs/development/python-modules/accuweather/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix index 01a299c89fd..ccacef6df57 100644 --- a/pkgs/development/python-modules/accuweather/default.nix +++ b/pkgs/development/python-modules/accuweather/default.nix @@ -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" "" ''; From 7b4d21de139781a7d4c21a6fe65589355ae7bbf5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 May 2021 23:24:02 +0200 Subject: [PATCH 04/13] python3Packages.pymodbus: 2.5.1 -> 2.5.2 --- pkgs/development/python-modules/pymodbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 9d524bfe946..46b60419ad8 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -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 From ac4b1133ad1981ea29ad5ab06b3d729645e25696 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 May 2021 23:52:56 +0200 Subject: [PATCH 05/13] home-assistant: enable debugpy tests --- pkgs/servers/home-assistant/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 5383ae33d13..97327d6c3b2 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -411,6 +411,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 = [ From 0ccad642a57cb84d939caf5542f06e566d997d8a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 13 May 2021 15:00:45 -0700 Subject: [PATCH 06/13] beets: unstable-2021-04-17 -> unstable-2021-05-13 --- pkgs/tools/audio/beets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index b9ed3eca919..c218aa7e4e1 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -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 = [ From 71904ffabc7ada991b15da262d5eb7926e68bf13 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 May 2021 00:03:03 +0200 Subject: [PATCH 07/13] python3Packages.pyvesync: 1.3.1 -> 1.4.0 --- pkgs/development/python-modules/pyvesync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index 393170cfb9f..1146fe892f5 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -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 ]; From 156d2667b54d87e282e6ba1fdd6117ad89a2cad8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 May 2021 00:07:31 +0200 Subject: [PATCH 08/13] home-assistant: enable pyvesync tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a9d3ae02ea1..5cac367cb90 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -397,6 +397,7 @@ in with py.pkgs; buildPythonApplication rec { "uptime" "vacuum" "verisure" + "vesync" "weather" "webhook" "websocket_api" From 8d51ba4515a3ca023a9c302d3d5634037418f724 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 May 2021 03:05:21 +0200 Subject: [PATCH 09/13] python3Packages.xknx: 0.18.1 -> 0.18.2 (#122896) --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index aefe3ed2b95..ca23184726c 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -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 = [ From 823251ae5ccbaa17d046224524f3db7a6225ddd1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 May 2021 21:17:17 +0200 Subject: [PATCH 10/13] python3Packages.pyhaversion: 21.3.0 -> 21.5.0 --- pkgs/development/python-modules/pyhaversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index ade4c01833c..efc06ad0c96 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -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 = [ From f82a8914a461fbdd046843467f110771a7988dbc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 May 2021 03:46:14 +0200 Subject: [PATCH 11/13] home-assistant: enable version component tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3d4bd9aa542..7616dc0ee87 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -397,6 +397,7 @@ in with py.pkgs; buildPythonApplication rec { "uptime" "vacuum" "verisure" + "version" "vesync" "weather" "webhook" From 4b349864caf92c088eec3034804d134c568065b6 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Thu, 13 May 2021 20:53:35 -0700 Subject: [PATCH 12/13] gnuradio: rename wrap option to doWrap Prevents naming conflict, see NixOS#121563 --- pkgs/applications/radio/gnuradio/wrapper.nix | 4 ++-- pkgs/top-level/all-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index d255b199bc9..378efb77fb8 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -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 = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4dec9003472..ea5e3a4b431 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23022,7 +23022,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 @@ -23052,7 +23052,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; @@ -23081,7 +23081,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; From 3c93d355b477c4297ef462da2bb79358d03767f9 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Thu, 13 May 2021 20:54:26 -0700 Subject: [PATCH 13/13] wrap: init at 0.3.1 --- pkgs/tools/text/wrap/default.nix | 36 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/text/wrap/default.nix diff --git a/pkgs/tools/text/wrap/default.nix b/pkgs/tools/text/wrap/default.nix new file mode 100644 index 00000000000..e228f946a8c --- /dev/null +++ b/pkgs/tools/text/wrap/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea5e3a4b431..1e6477bcdd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9639,6 +9639,8 @@ in wpgtk = callPackage ../tools/X11/wpgtk { }; + wrap = callPackage ../tools/text/wrap { }; + wring = nodePackages.wring; wrk = callPackage ../tools/networking/wrk { };