From 919b55c49c7cd3bd79dbebf0020c950645fd8edc Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 11 Mar 2021 19:38:14 +0100 Subject: [PATCH 01/16] php80: 8.0.2 -> 8.0.3 Changelog: https://www.php.net/ChangeLog-8.php#8.0.3 --- pkgs/development/interpreters/php/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index a4aa4842dfa..233b0da4380 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "8.0.2"; - sha256 = "1rm3gc2h9l0zd1ccawpg1wxqm8v8rllq417f2w5pqcdf7sgah3q0"; + version = "8.0.3"; + sha256 = "04mh5sznbgwv67x9p0qz4i377zwdb5cc6r1mb3925y1lkqfn5y4m"; }); in base.withExtensions ({ all, ... }: with all; ([ From 82734e8ceb58fe3a5ad72001dac7b0212e73e69f Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 11 Mar 2021 19:39:58 +0100 Subject: [PATCH 02/16] php74: 7.4.15 -> 7.4.16 Changelog: https://www.php.net/ChangeLog-7.php#7.4.16 --- pkgs/development/interpreters/php/7.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 42aa28b65e6..812a59ec8a3 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.4.15"; - sha256 = "0mvp7b16sy9j36v9v1mhixwz16hi8mhax7rwpqy3sv24jc1bxmqv"; + version = "7.4.16"; + sha256 = "0gnfb4vaj71fiap0q9lk6vs1xs7l6sha60isw6aaw3zxgh00ywc5"; }); in base.withExtensions ({ all, ... }: with all; ([ From ad44060f5683293f5767d6a28e335f9f22c51bf6 Mon Sep 17 00:00:00 2001 From: Milan Date: Sat, 13 Mar 2021 08:45:15 +0100 Subject: [PATCH 03/16] matrix-synapse-plugins.matrix-synapse-shared-secret-auth: init at 1.0.2 (#112671) --- .../servers/matrix-synapse/plugins/default.nix | 1 + .../plugins/shared-secret-auth.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix diff --git a/pkgs/servers/matrix-synapse/plugins/default.nix b/pkgs/servers/matrix-synapse/plugins/default.nix index f3dbaa1573f..f68be9f8e65 100644 --- a/pkgs/servers/matrix-synapse/plugins/default.nix +++ b/pkgs/servers/matrix-synapse/plugins/default.nix @@ -3,4 +3,5 @@ { matrix-synapse-ldap3 = callPackage ./ldap3.nix { }; matrix-synapse-pam = callPackage ./pam.nix { }; + matrix-synapse-shared-secret-auth = callPackage ./shared-secret-auth.nix { }; } diff --git a/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix b/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix new file mode 100644 index 00000000000..5c0dc1e2ce2 --- /dev/null +++ b/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix @@ -0,0 +1,18 @@ +{ buildPythonPackage, fetchFromGitHub, twisted }: + +buildPythonPackage rec { + pname = "matrix-synapse-shared-secret-auth"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "devture"; + repo = "matrix-synapse-shared-secret-auth"; + rev = version; + sha256 = "0cnxp3bp8mmk01a0g3lzgvaawyywjg754j4nb9iwkmm3c2nqvnpz"; + }; + + doCheck = false; + pythonImportsCheck = [ "shared_secret_authenticator" ]; + + propagatedBuildInputs = [ twisted ]; +} From 6c8b581877f9c53788062417b391ea04daaf2b05 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Mar 2021 07:59:29 +0000 Subject: [PATCH 04/16] lazygit: 0.25.1 -> 0.26 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 10e701d1e93..f741ca3382a 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.25.1"; + version = "0.26"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A4Nim1jnyMHd5hxyLu8oZkQ9nDWxTmaX/25WX714ry4="; + sha256 = "sha256-9CiXbMYb+EoxBrVFiPuWAlRJvYAq8hpxVDFcymk7Ud0="; }; vendorSha256 = null; From 3c9f3fafb7a7352b297c299de53becb4f53469b8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Mar 2021 23:49:56 +0000 Subject: [PATCH 05/16] python38Packages.fluent-logger: 0.9.6 -> 0.10.0 --- pkgs/development/python-modules/fluent-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fluent-logger/default.nix b/pkgs/development/python-modules/fluent-logger/default.nix index 70c9173f4d5..00cc8bf58a3 100644 --- a/pkgs/development/python-modules/fluent-logger/default.nix +++ b/pkgs/development/python-modules/fluent-logger/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fluent-logger"; - version = "0.9.6"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "a7d47eae4d2a11c8cb0df10ae3d034d95b0b8cef9d060e59e7519ad1f82ffa73"; + sha256 = "678bda90c513ff0393964b64544ce41ef25669d2089ce6c3b63d9a18554b9bfa"; }; prePatch = '' From 712768610f187e1d6809bc2a0f4fe11fb8a26508 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Mar 2021 22:11:57 +0000 Subject: [PATCH 06/16] python38Packages.casbin: 0.18.2 -> 0.18.3 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index d6e33ff8cb6..6d86ccb9543 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.18.2"; + version = "0.18.3"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0gi7qm02sdlmmmz6vi8d7b7kibgw4q67kix55y4jsvi0bvwc0i8w"; + sha256 = "1wbwccwizndiww9a3x1jhixzpcg2qmqlxidk2rqnrzvp04lb8b0q"; }; propagatedBuildInputs = [ From 2e0b261da8c4a08d642bcbf115ffbca5d69ff481 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 13 Mar 2021 10:44:31 +0100 Subject: [PATCH 07/16] python3Packages.urllib3: disable two tests that fail on aarch64 Use null workaround to avoid rebuild on other platforms. --- pkgs/development/python-modules/urllib3/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index c255eea04c5..ea554efe353 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , brotli , buildPythonPackage , certifi @@ -46,6 +47,14 @@ buildPythonPackage rec { trustme ]; + disabledTests = if stdenv.hostPlatform.isAarch64 then + [ + "test_connection_closed_on_read_timeout_preload_false" + "test_ssl_failed_fingerprint_verification" + ] + else + null; + pythonImportsCheck = [ "urllib3" ]; meta = with lib; { From ac5d22c579a60fcf3fa86a18aea23ea3e7be6ab9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Mar 2021 10:01:41 +0000 Subject: [PATCH 08/16] open-policy-agent: 0.27.0 -> 0.27.1 --- pkgs/development/tools/open-policy-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 8491abac19a..a73907cd257 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-WMCd7+SUpKagoutBqI98KnoOd/UwJqFrSh0RAJQvuSo="; + sha256 = "sha256-IiPUmLgkD50LxOT+ZEf/UZJ0192GYOy9xk8U94Q0BWc="; }; vendorSha256 = null; From 6e452303a78bf5969d053e1c7f7f1ce6848155e2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 13 Mar 2021 11:33:01 +0100 Subject: [PATCH 09/16] pythonPackages.beniget: init at 0.3.0 --- .../python-modules/beniget/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/beniget/default.nix diff --git a/pkgs/development/python-modules/beniget/default.nix b/pkgs/development/python-modules/beniget/default.nix new file mode 100644 index 00000000000..c5508fb3303 --- /dev/null +++ b/pkgs/development/python-modules/beniget/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, gast +}: + +buildPythonPackage rec { + pname = "beniget"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "062c893be9cdf87c3144fb15041cce4d81c67107c1591952cd45fdce789a0ff1"; + }; + + propagatedBuildInputs = [ + gast + ]; + + meta = { + description = "Extract semantic information about static Python code"; + homepage = "https://github.com/serge-sans-paille/beniget"; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5b991da11f2..b7dff5b1121 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -951,6 +951,8 @@ in { bellows = callPackage ../development/python-modules/bellows { }; + beniget = callPackage ../development/python-modules/beniget { }; + bespon = callPackage ../development/python-modules/bespon { }; betacode = callPackage ../development/python-modules/betacode { }; From 782afeb11c75caeea52b8ac780ce8f17541f8361 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 13 Mar 2021 11:33:31 +0100 Subject: [PATCH 10/16] python3Packages.pythran: init at 0.9.8post3 --- .../python-modules/pythran/default.nix | 69 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/development/python-modules/pythran/default.nix diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix new file mode 100644 index 00000000000..864234a37e2 --- /dev/null +++ b/pkgs/development/python-modules/pythran/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestrunner +, ply +, networkx +, decorator +, gast +, six +, numpy +, beniget +, pytestCheckHook +, scipy +, isPy3k +}: + +buildPythonPackage rec { + pname = "pythran"; + version = "0.9.8post3"; + + src = fetchFromGitHub { + owner = "serge-sans-paille"; + repo = "pythran"; + rev = version; + sha256 = "sha256-GCWjJlf7zpFzELR6wTF8FoJzJ3F/WdT1hHjY5A5h/+4="; + }; + + nativeBuildInputs = [ + pytestrunner + ]; + + propagatedBuildInputs = [ + ply + networkx + decorator + gast + six + numpy + beniget + ]; + + pythonImportsCheck = [ + "pythran" + "pythran.backend" + "pythran.middlend" + "pythran.passmanager" + "pythran.toolchain" + "pythran.spec" + ]; + + checkInputs = [ + pytestCheckHook + numpy + scipy + ]; + + # Test suite is huge. + # Also, in the future scipy will rely on it resulting in a circular test dependency + doCheck = false; + + disabled = !isPy3k; + + meta = { + description = "Ahead of Time compiler for numeric kernels"; + homepage = https://github.com/serge-sans-paille/pythran; + license = lib.licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b7dff5b1121..53d99d3469f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6780,6 +6780,8 @@ in { python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; + pythran = callPackage ../development/python-modules/pythran { }; + pyeverlights = callPackage ../development/python-modules/pyeverlights { }; pytile = callPackage ../development/python-modules/pytile { }; From 1c392b836208bb6c24278c4f2fb687fe208cca59 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Mar 2021 10:50:27 +0000 Subject: [PATCH 11/16] pistol: 0.1.8 -> 0.1.9 --- pkgs/tools/misc/pistol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index 6eec45db011..f31de57fdfe 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pistol"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "00vpl43m0zw6vqw8yjkaa7dnis9g169jfb48g2mr0hgyhsjr7jbj"; + sha256 = "sha256-Q/W+1NvbuSu+QfezJpyeI5r4VlzdAAbOlSfFIT8knJs="; }; - vendorSha256 = "1rkyvcyrjnrgd3b05gjd4sv95j1b99q641f3n36kgf3sc3hp31ws"; + vendorSha256 = "sha256-oXt2nZ9lcAiI9ZQtKuQrXOXDfqx3Ucvh/K6g7SScd2Q="; doCheck = false; From 9fe8be66858a7d62a866b246f89c372bd4227e2f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 13 Mar 2021 12:12:13 +0100 Subject: [PATCH 12/16] chromiumDev: 90.0.4430.19 -> 91.0.4442.4 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 98fe3397733..6d94e30d95e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "90.0.4430.19", - "sha256": "174isyx4g62d8ggn9imp41dfklcbxi3y5nfprm4jbjmn5cb7v8xa", - "sha256bin64": "1155mk933xvhd8141dp210akkmbcchly3q4cr7v176id50dvpnxl", + "version": "91.0.4442.4", + "sha256": "0cmm2pimkghb6s956bkqf2k77lj69dz51nlydgkqbvw0sc8n784k", + "sha256bin64": "1hbfx8n51p7dwwz1vbp94jdmlb96vvxrbql2af4kmvx1bmzr2ism", "deps": { "gn": { "version": "2021-02-09", From 9fc486d67fa71929aa9440aa9a6b87114103c72d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 13 Mar 2021 12:28:48 +0100 Subject: [PATCH 13/16] caerbannog: use fetchFromSourcehut --- pkgs/applications/misc/caerbannog/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/caerbannog/default.nix b/pkgs/applications/misc/caerbannog/default.nix index 451980352c2..6f4558b868f 100644 --- a/pkgs/applications/misc/caerbannog/default.nix +++ b/pkgs/applications/misc/caerbannog/default.nix @@ -1,5 +1,5 @@ { lib -, fetchgit +, fetchFromSourcehut , python3 , glib , gobject-introspection @@ -18,8 +18,9 @@ python3.pkgs.buildPythonApplication rec { version = "0.3"; format = "other"; - src = fetchgit { - url = "https://git.sr.ht/~craftyguy/caerbannog"; + src = fetchFromSourcehut { + owner = "~craftyguy"; + repo = "caerbannog"; rev = version; sha256 = "0wqkb9zcllxm3fdsr5lphknkzy8r1cr80f84q200hbi99qql1dxh"; }; From ed0d586941ad1ba8e595eeb60586be1e2fd1432b Mon Sep 17 00:00:00 2001 From: Julien Langlois Date: Thu, 11 Mar 2021 15:24:47 -0500 Subject: [PATCH 14/16] google-chrome: add libva support Chrome cannot do hardware video acceleration without libva in its search path. This just adds libva. Tested against a VP9 video looking at chrome://media-internals and intel_gpu_top. --- .../networking/browsers/google-chrome/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index c5e5aff77e0..bc5922222ab 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -39,6 +39,9 @@ , gsettings-desktop-schemas , gnome3 + +# For video acceleration via VA-API (--enable-features=VaapiVideoDecoder) +, libvaSupport ? true, libva }: with lib; @@ -63,6 +66,7 @@ let kerberos libdrm mesa coreutils libxkbcommon wayland ] ++ optional pulseSupport libpulseaudio + ++ optional libvaSupport libva ++ [ gtk3 ]; suffix = if channel != "stable" then "-" + channel else ""; From 2fad2f2d68890dedf0f7d52667e344b5780977d8 Mon Sep 17 00:00:00 2001 From: Julien Langlois Date: Fri, 12 Mar 2021 12:50:36 -0500 Subject: [PATCH 15/16] google-chrome: add vulkan support --- .../networking/browsers/google-chrome/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index bc5922222ab..b208ebf2ab0 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -42,6 +42,9 @@ # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder) , libvaSupport ? true, libva + +# For Vulkan support (--enable-features=Vulkan) +, vulkanSupport ? true, vulkan-loader }: with lib; @@ -67,6 +70,7 @@ let libxkbcommon wayland ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva + ++ optional vulkanSupport vulkan-loader ++ [ gtk3 ]; suffix = if channel != "stable" then "-" + channel else ""; From e131f22f503e37e22b5a8af98960a9eede793258 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 13 Mar 2021 12:53:06 +0100 Subject: [PATCH 16/16] pythonPackages.cadquery: wrap pythonocc-core-cadquery with toPythonModule Otherwise it won't be kept track of with the Python infra. --- pkgs/development/python-modules/cadquery/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cadquery/default.nix b/pkgs/development/python-modules/cadquery/default.nix index 72334390bc3..bc8cbe1f2c8 100644 --- a/pkgs/development/python-modules/cadquery/default.nix +++ b/pkgs/development/python-modules/cadquery/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, toPythonModule , isPy3k , pythonOlder , pythonAtLeast @@ -23,7 +24,7 @@ }: let - pythonocc-core-cadquery = stdenv.mkDerivation { + pythonocc-core-cadquery = toPythonModule (stdenv.mkDerivation { pname = "pythonocc-core-cadquery"; version = "0.18.2"; @@ -61,7 +62,7 @@ let "-DSMESH_LIB_PATH=${smesh}/lib" "-DPYTHONOCC_WRAP_SMESH=TRUE" ]; - }; + }); in buildPythonPackage rec {