From d9eda6abbfb5099274ca7a11c5ab4b17a214be4c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 7 Dec 2020 05:31:22 +1000 Subject: [PATCH 1/8] fd: 8.1.1 -> 8.2.0 https://github.com/sharkdp/fd/releases/tag/v8.2.0 --- pkgs/tools/misc/fd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 31b47a31ca8..56b3e770e82 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.1.1"; + version = "8.2.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "0qzqnsjkq8i4gzn9273algx33kr1hzgxid8lnqp4awy2zxm4ksiq"; + sha256 = "1g9jnf9h2s33l5q9z892vmvj78phwd4hfvspvnraxj4lvjp707ia"; }; - cargoSha256 = "1d7hfgl9l4b9bnq2qcpvdq5rh7lpz33r19hw3wwgnqh142q67m7r"; + cargoSha256 = "0yavp67fb4vqygww9kjzdi7gr7dj4aw47s03dkwlz526rhkhappw"; nativeBuildInputs = [ installShellFiles ]; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { installManPage doc/fd.1 installShellCompletion $releaseDir/build/fd-find-*/out/fd.{bash,fish} - installShellCompletion --zsh $releaseDir/build/fd-find-*/out/_fd + installShellCompletion --zsh contrib/completion/_fd ''; meta = with lib; { From ac229d9419175ca83e5fc3f2001cde4ced980850 Mon Sep 17 00:00:00 2001 From: mingmingrr Date: Sun, 6 Dec 2020 16:50:28 -0500 Subject: [PATCH 2/8] pythonPackages.hydrus: 413 -> 420 --- pkgs/applications/graphics/hydrus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 556e5e30f3a..8e9998dde39 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ pythonPackages.buildPythonPackage { pname = "hydrus"; - version = "413"; + version = "420"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; - rev = "9fbed11bef499e01a6799b298bea7d0967d30430"; - sha256 = "1dl7qpzmlxl376lzm0chmwvf4nl55wz6fwcsw0ikb33rm8r33gq4"; + rev = "067c4862a0ed8dd9264b464c69975b520139809f"; + sha256 = "12x0rv2yxsczdaxvpb5ggf4jwzjd1vd7ml0r61s4342zwvjrhji9"; }; nativeBuildInputs = [ From 8d9b3163b33c725ff9afd696657df1aca4a1c81c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Dec 2020 22:53:26 +0000 Subject: [PATCH 3/8] python37Packages.cloudflare: 2.8.13 -> 2.8.14 --- pkgs/development/python-modules/cloudflare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 7692bd1c9d6..a7b6d204f19 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.8.13"; + version = "2.8.14"; src = fetchPypi { inherit pname version; - sha256 = "a662990737d86984156a48f769e6528d947e90fd1561bb5e19d0036b59b9fd6f"; + sha256 = "5787892fdee3a6408b4290de0371426ab778a7ebf44decad9d843cab1ef0a1ac"; }; propagatedBuildInputs = [ From 4d20dc5e87a79e9367b577b9263515932c87f513 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 7 Dec 2020 01:02:48 +0000 Subject: [PATCH 4/8] ytcc: fix checkPhase Fixes: ERROR: Wrong expression passed to '-k': not get_channels \ and not play_video \ and not download_videos \ and not update_all \ and not add_channel_duplicate: at column 18: unexpected character "\" --- pkgs/tools/networking/ytcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index dc38648c369..2d474159359 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -19,11 +19,11 @@ python3Packages.buildPythonApplication rec { # Disable tests that touch network or shell out to commands checkPhase = '' - pytest . -k 'not get_channels \ + pytest . -k "not get_channels \ and not play_video \ and not download_videos \ and not update_all \ - and not add_channel_duplicate' + and not add_channel_duplicate" ''; meta = { From bfd4d4c23aa81b871ecab34f41d8ff980c85be64 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Dec 2020 16:17:28 +0000 Subject: [PATCH 5/8] orca: 3.38.0 -> 3.38.1 --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 29ee6213a65..377f00d1c16 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.38.0"; + version = "3.38.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vkg6p1dlrgx1yyscmy0m58inaq4ljshbdxw0nhi1nwqk3bpjchw"; + sha256 = "1sqmq9xhcm3rc3mbhj1bdn55bkpzbk72xhmgka75syxh77gzz0ld"; }; patches = [ From 42f5ab510d585417208d7b7286604d5957c417d7 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 7 Dec 2020 02:22:23 +0000 Subject: [PATCH 6/8] python3Packages.aiohttp-jinja2: fix checkPhase --- pkgs/development/python-modules/aiohttp-jinja2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 4bc41cf32f3..0a939dfb009 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }: +{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytestcov }: buildPythonPackage rec { pname = "aiohttp-jinja2"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp jinja2 ]; - checkInputs = [ pytest pytest-aiohttp ]; + checkInputs = [ pytest pytest-aiohttp pytestcov ]; checkPhase = '' pytest -W ignore::DeprecationWarning From 8e51774f63561aa67c55f8669f17b7d0a372694c Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Mon, 7 Dec 2020 12:03:45 +0800 Subject: [PATCH 7/8] perlPackages.Appcpm: 0.995 -> 0.996 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5202aa013e3..7ab3b6cf885 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -598,10 +598,10 @@ let Appcpm = buildPerlModule { pname = "App-cpm"; - version = "0.995"; + version = "0.996"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.995.tar.gz"; - sha256 = "b17fb0b7f97eb86430952bf387b6f08b5252413cb97474d1bf26e3376a4cc496"; + url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.996.tar.gz"; + sha256 = "5684535511e5abc0aa8eb6105b13f5759b5d03b6808f30149508358b0a11f595"; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy ModuleCPANfile ParallelPipes locallib ]; From c377ced8de37f63e6af880bfb6df6bf65a7862b0 Mon Sep 17 00:00:00 2001 From: Monson Shao Date: Sun, 6 Dec 2020 13:40:51 +0800 Subject: [PATCH 8/8] webkitgtk: drop wayland dependency on Darwin --- pkgs/development/libraries/webkitgtk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index a3412e1b0b7..ed97e1c8a85 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation rec { python3 ruby glib # for gdbus-codegen + ] ++ stdenv.lib.optionals stdenv.isLinux [ wayland # for wayland-scanner ];