From b1d8148363d211f9f6ffb144bf44ecf560e2106b Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Tue, 9 Mar 2021 15:06:26 +0800 Subject: [PATCH 1/9] perlPackages.NetAsyncHTTP: 0.47 -> 0.48 --- 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 2e42ce58bb5..aebfd0a7ed3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15004,10 +15004,10 @@ let NetAsyncHTTP = buildPerlModule { pname = "Net-Async-HTTP"; - version = "0.47"; + version = "0.48"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-HTTP-0.47.tar.gz"; - sha256 = "1lwy1ijrhibi087p3q5zvadhkq0slfrzfhb76cmkx4mpyv5v4l8f"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-HTTP-0.48.tar.gz"; + sha256 = "0gpp46lg7sr5xpsjhqkb022f9v88wy73carsrn5pvbmwjpwxcjwx"; }; buildInputs = [ HTTPCookies TestIdentity TestMetricsAny TestRefcount ]; propagatedBuildInputs = [ Future HTTPMessage IOAsync MetricsAny StructDumb URI ]; From 00a1314d695854c045798a14a8fb18d99888f3f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Mar 2021 09:56:45 +0000 Subject: [PATCH 2/9] python38Packages.limnoria: 2021.01.15 -> 2021.03.13 --- pkgs/development/python-modules/limnoria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 86a505d4448..6f0532a390a 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2021.01.15"; + version = "2021.03.13"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "5d7109fc779c44070e3c57186eae59b133014835d5fe15b262fa9438d7599c81"; + sha256 = "c13dd7a84eddfcf9c3068d57f3c9da90ea7c0d11688dc3f78f9265f3f093c6ea"; }; patchPhase = '' From 835349c1673892028a580d54612f69bf3e8af7a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Mar 2021 11:21:35 +0000 Subject: [PATCH 3/9] bettercap: 2.30 -> 2.30.2 --- pkgs/tools/security/bettercap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index 940086788af..1383de79feb 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "bettercap"; - version = "2.30"; + version = "2.30.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ge+fbNEWq+84LypUbNrnNMOxcDJb8rFlP/QUoE7yEds="; + sha256 = "sha256-5CAWMW0u/8BUn/8JJBApyHGH+/Tz8hzAmSChoT2gFr8="; }; vendorSha256 = "sha256-fApxHxdzEEc+M+U5f0271VgrkXTGkUD75BpDXpVYd5k="; From 57144e414f4e931da16517374894f9e2cb72762b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Mar 2021 14:03:49 +0000 Subject: [PATCH 4/9] findomain: 3.1.0 -> 4.0.1 --- pkgs/tools/networking/findomain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 681f6002ca6..22631518e71 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "3.1.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-mZJyxbxMIw3jr7ASzYKEfZFh4GS6ZfGKsRkzOtUCYOA="; + sha256 = "sha256-uv1boI9iaBeobo/58Di4oslh1eGLuK9HR5EwQQeWn+0="; }; - cargoSha256 = "sha256-JIyv21u+r2CpgsiW5O7Fy4CWXpkW4jRDrH0CSY2CgiU="; + cargoSha256 = "sha256-31OD/sv4br9cdBNqNGr4McypSGkBbKs7b7H1u7mFt3o="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; From edacaf3a57c34315757a1b5fdc5f53f5e8a146ea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Mar 2021 04:16:13 +0000 Subject: [PATCH 5/9] circleci-cli: 0.1.15108 -> 0.1.15149 --- pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index e8e84a7f51d..2d5e77f7918 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.15108"; + version = "0.1.15149"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r0GSv9JaQQkVLYDh51Rz6OIDTqV75RIT+NIWAFXWcV8="; + sha256 = "sha256-pmLDCNgCQv4fetl/q6ZokH1qF6pSqsR0DUWbzGeEtaw="; }; vendorSha256 = "sha256-j7VP/QKKMdmWQ60BYpChG4syDlll7CY4rb4wfb4+Z1s="; From 6976cad5c7e95f3061894ddd9e62338ecccb2e81 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Thu, 11 Mar 2021 19:16:10 +0100 Subject: [PATCH 6/9] python3Packages.altair: propagate jinja2 as buildInput also add an pythonImportsCheck --- pkgs/development/python-modules/altair/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 37c1efd9c1b..99ee559da6b 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -33,18 +33,20 @@ buildPythonPackage rec { pandas six toolz + jinja2 ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; checkInputs = [ glibcLocales ipython - jinja2 pytest recommonmark sphinx vega_datasets ]; + pythonImportsCheck = [ "altair" ]; + checkPhase = '' export LANG=en_US.UTF-8 # histogram_responsive.py attempt network access, and cannot be disabled through pytest flags From a473735da55a9ca8bbebba1dda0fb7764936942b Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Fri, 19 Mar 2021 17:47:26 +0200 Subject: [PATCH 7/9] pythonPackages.nbconvert: include templates in search paths --- .../development/python-modules/nbconvert/default.nix | 10 ++++++++++ .../python-modules/nbconvert/templates.patch | 12 ++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/nbconvert/templates.patch diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 582a6132c25..02eda2beb19 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -30,6 +30,16 @@ buildPythonPackage rec { sha256 = "cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002"; }; + # Add $out/share/jupyter to the list of paths that are used to search for + # various exporter templates + patches = [ + ./templates.patch + ]; + + postPatch = '' + substituteAllInPlace ./nbconvert/exporters/templateexporter.py + ''; + checkInputs = [ pytestCheckHook glibcLocales ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nbconvert/templates.patch b/pkgs/development/python-modules/nbconvert/templates.patch new file mode 100644 index 00000000000..cadaf69a7b8 --- /dev/null +++ b/pkgs/development/python-modules/nbconvert/templates.patch @@ -0,0 +1,12 @@ +diff --git a/nbconvert/exporters/templateexporter.py b/nbconvert/exporters/templateexporter.py +index 0d540eb1..440f6382 100644 +--- a/nbconvert/exporters/templateexporter.py ++++ b/nbconvert/exporters/templateexporter.py +@@ -616,6 +616,7 @@ class TemplateExporter(Exporter): + if DEV_MODE: + root_dirs.append(os.path.abspath(os.path.join(ROOT, '..', '..', 'share', 'jupyter'))) + root_dirs.extend(jupyter_path()) ++ root_dirs.append(os.path.join("@out@", "share", "jupyter")) + return root_dirs + + def _init_resources(self, resources): From 5250d1236241c4295cc9576b562da843c4008d7c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Mar 2021 19:36:39 +0000 Subject: [PATCH 8/9] trompeloeil: 39 -> 40 --- pkgs/development/libraries/trompeloeil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix index 800b3564011..062c441063c 100644 --- a/pkgs/development/libraries/trompeloeil/default.nix +++ b/pkgs/development/libraries/trompeloeil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trompeloeil"; - version = "39"; + version = "40"; src = fetchFromGitHub { owner = "rollbear"; repo = "trompeloeil"; rev = "v${version}"; - sha256 = "1053iw4isi7qsy94fqmh570wki999sg9n70jhqy8kfy1bniczh0l"; + sha256 = "sha256-q0iMM3Hb5Y21RUhhxFEd/q4OCJFJ12gozZd5jCDscro="; }; nativeBuildInputs = [ cmake ]; From c2d3754b75586e2008c692fe9bc281f6a83b38a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Mar 2021 06:14:01 +0000 Subject: [PATCH 9/9] xmlrpc_c: 1.51.06 -> 1.51.07 --- pkgs/development/libraries/xmlrpc-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index 7b6907a0162..3bcc40b5da3 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, curl, libxml2 }: stdenv.mkDerivation rec { - name = "xmlrpc-c-1.51.06"; + name = "xmlrpc-c-1.51.07"; src = fetchurl { url = "mirror://sourceforge/xmlrpc-c/${name}.tgz"; - sha256 = "1l4zz22q10081vr06b8sii0l3krr64xyiywz6rcladw8kiyxip06"; + sha256 = "sha256-hNIK4z+SdYL4IdYcC5GUrvvx15JFkKE/qdpa4WmK3tk="; }; buildInputs = [ curl libxml2 ];