From c4664f6bf18c9c8e1bd47f176f3608b4101f4514 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Apr 2022 12:38:41 +0200 Subject: [PATCH 01/13] microcodeIntel: 20220207 -> 20220419 https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20220419 --- pkgs/os-specific/linux/microcode/intel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index f239cb307c7..41091181ee8 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20220207"; + version = "20220419"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "sha256-yNHYAf8AX8C8iSaFWa6u7knUryaUgvI6nIH9jkD4jjw="; + sha256 = "sha256-i3OhOEqyK6gJfRIPewPGb4/6k6lO0atmedEqJ2e+66U="; }; nativeBuildInputs = [ iucode-tool libarchive ]; From 977f14fab1227bea9f7272cbbbba9f563d102f7a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 16 Apr 2022 14:37:42 +0100 Subject: [PATCH 02/13] re2c: add some key reverse dependencies to passthru.tests --- pkgs/development/tools/parsing/re2c/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 41ec653a409..02be14908e4 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -4,6 +4,11 @@ , autoreconfHook , nix-update-script , python3 + +# for passthru.tests +, ninja +, php +, spamassassin }: stdenv.mkDerivation rec { @@ -33,6 +38,9 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { attrPath = pname; }; + tests = { + inherit ninja php spamassassin; + }; }; meta = with lib; { From 7fde85cbe1893c1b0f729063d705786391a1f911 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 May 2022 10:30:04 +0200 Subject: [PATCH 03/13] python310Packages.oletools: 0.60 -> 0.60.1 --- pkgs/development/python-modules/oletools/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix index 76019730eb7..3ba66ac38ed 100644 --- a/pkgs/development/python-modules/oletools/default.nix +++ b/pkgs/development/python-modules/oletools/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "oletools"; - version = "0.60"; + version = "0.60.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "decalage2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gatUVkf8iT1OGnahX1BzQLDypCqhS1EvkAgUHJ6myA4="; + hash = "sha256-H3oL8sk2r267wV0hoHOq9r9DY2Atxs+hZUVb6tmHy0w="; }; propagatedBuildInputs = [ @@ -47,6 +47,7 @@ buildPythonPackage rec { disabledTests = [ # Test fails with AssertionError: Tuples differ: ('MS Word 2007+... "test_all" + "test_xlm" ]; pythonImportsCheck = [ @@ -54,7 +55,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Python tool to analyze MS OLE2 files and MS Office documents"; + description = "Module to analyze MS OLE2 files and MS Office documents"; homepage = "https://github.com/decalage2/oletools"; license = with licenses; [ bsd2 /* and */ mit ]; maintainers = with maintainers; [ fab ]; From b544d177a26985b5fc1149612bac511f35be6a48 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 May 2022 11:11:40 +0200 Subject: [PATCH 04/13] lib.licenses: add DRL-1.0 https://spdx.org/licenses/DRL-1.0.html https://github.com/SigmaHQ/sigma/blob/master/LICENSE.Detection.Rules.md --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 2928d11d8b2..4fa6d6abc7a 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -285,6 +285,11 @@ in mkLicense lset) ({ fullName = "DOC License"; }; + drl10 = { + spdxId = "DRL-1.0"; + fullName = "Detection Rule License 1.0"; + }; + eapl = { fullName = "EPSON AVASYS PUBLIC LICENSE"; url = "https://avasys.jp/hp/menu000000700/hpg000000603.htm"; From 4fbc3657db02f9739f2009fbb924aad2ac93ebf1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 09:29:48 +0000 Subject: [PATCH 05/13] python310Packages.aws-lambda-builders: 1.15.0 -> 1.16.0 --- .../python-modules/aws-lambda-builders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index ce5c753a4af..6d4baf0f553 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.15.0"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - sha256 = "sha256-kXglpj82e+LzUI6SW86wyfG2lGVnL/PsrTNsseg4VYk="; + sha256 = "sha256-XJDukyYTtnAHiHACi5gEJ9VPjqv8Y4V7oe4q3l5fpMA="; }; propagatedBuildInputs = [ From bb55ac971a77b7d23d4963eb6ba33652a568d1ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 09:47:50 +0000 Subject: [PATCH 06/13] python310Packages.extractcode: 30.0.0 -> 31.0.0 --- pkgs/development/python-modules/extractcode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index 93374bd004c..8af4cb865fd 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "extractcode"; - version = "30.0.0"; + version = "31.0.0"; src = fetchPypi { inherit pname version; - sha256 = "5a660d1b9e3bae4aa87828e6947dc3b31dc2fa6705acb28a514874602b40bc90"; + sha256 = "sha256-gIGTkum8+BKfdNiQT+ipjA3+0ngjVoQnNygsAoMRPYg="; }; dontConfigure = true; From 6be42c879ddd2584f646a86764f7df3212e6c21c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 17:05:05 +0000 Subject: [PATCH 07/13] python310Packages.pydeconz: 91 -> 92 --- pkgs/development/python-modules/pydeconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 8523fd96f64..965b4ecf620 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "91"; + version = "92"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-JoQapWQZPjP9TD6gnIGE23hzBt22kAWDKreTzq3GBWQ="; + hash = "sha256-qA7AgiiRBq1ekBcQDC8LlLnZLthA0QFZpxNUZdrMMIA="; }; propagatedBuildInputs = [ From 381ef9d262b1cdb5fc4e0636f7f0fdb0214b97e5 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Tue, 10 May 2022 11:14:10 -0600 Subject: [PATCH 08/13] python3Packages.shiv: disable failing tests --- pkgs/development/python-modules/shiv/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/shiv/default.nix b/pkgs/development/python-modules/shiv/default.nix index 14cb688be46..ab873da47a7 100644 --- a/pkgs/development/python-modules/shiv/default.nix +++ b/pkgs/development/python-modules/shiv/default.nix @@ -25,6 +25,19 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # AssertionError + "test_hello_world" + "test_extend_pythonpath" + "test_multiple_site_packages" + "test_no_entrypoint" + "test_results_are_binary_identical_with_env_and_build_id" + "test_preamble" + "test_preamble_no_pip" + "test_alternate_root" + "test_alternate_root_environment_variable" + ]; + meta = with lib; { description = "Command line utility for building fully self contained Python zipapps"; homepage = "https://github.com/linkedin/shiv"; From f24cf4422db3f0d76f91af15d68dcaedaf22eba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 27 Jan 2022 10:48:49 +0300 Subject: [PATCH 09/13] maintainers: change musfay to muscaln --- maintainers/maintainer-list.nix | 8 ++++---- .../applications/science/electronics/fritzing/default.nix | 2 +- pkgs/development/libraries/pico-sdk/default.nix | 2 +- pkgs/development/tools/picotool/default.nix | 2 +- pkgs/tools/cd-dvd/bootiso/default.nix | 2 +- pkgs/tools/graphics/adriconf/default.nix | 2 +- pkgs/tools/misc/qdl/default.nix | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 357bcf6720d..7b01e10bf9a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8799,10 +8799,10 @@ githubId = 5047140; name = "Victor Collod"; }; - musfay = { - email = "musfay@protonmail.com"; - github = "musfay"; - githubId = 33374965; + muscaln = { + email = "muscaln@protonmail.com"; + github = "muscaln"; + githubId = 96225281; name = "Mustafa Çalışkan"; }; mupdt = { diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index c5723dbab98..668a34b511d 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -78,7 +78,7 @@ mkDerivation rec { description = "An open source prototyping tool for Arduino-based projects"; homepage = "https://fritzing.org/"; license = with licenses; [ gpl3 cc-by-sa-30 ]; - maintainers = with maintainers; [ robberer musfay ]; + maintainers = with maintainers; [ robberer muscaln ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix index eb98c2f9ef6..1b58253edc0 100644 --- a/pkgs/development/libraries/pico-sdk/default.nix +++ b/pkgs/development/libraries/pico-sdk/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/raspberrypi/picotool"; description = "SDK provides the headers, libraries and build system necessary to write programs for the RP2040-based devices"; license = licenses.bsd3; - maintainers = with maintainers; [ musfay ]; + maintainers = with maintainers; [ muscaln ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/picotool/default.nix b/pkgs/development/tools/picotool/default.nix index 507284081f5..f76e0287b56 100644 --- a/pkgs/development/tools/picotool/default.nix +++ b/pkgs/development/tools/picotool/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/raspberrypi/picotool"; description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary"; license = licenses.bsd3; - maintainers = with maintainers; [ musfay ]; + maintainers = with maintainers; [ muscaln ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/cd-dvd/bootiso/default.nix b/pkgs/tools/cd-dvd/bootiso/default.nix index 5acb901a549..ecd8ecbc9ae 100644 --- a/pkgs/tools/cd-dvd/bootiso/default.nix +++ b/pkgs/tools/cd-dvd/bootiso/default.nix @@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation rec { description = "Script for securely creating a bootable USB device from one image file"; homepage = "https://github.com/jsamr/bootiso"; license = licenses.gpl3; - maintainers = with maintainers; [ musfay ]; + maintainers = with maintainers; [ muscaln ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/graphics/adriconf/default.nix b/pkgs/tools/graphics/adriconf/default.nix index 738c5316882..a76eebf4938 100644 --- a/pkgs/tools/graphics/adriconf/default.nix +++ b/pkgs/tools/graphics/adriconf/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.freedesktop.org/mesa/adriconf/"; description = "A GUI tool used to configure open source graphics drivers"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ musfay ]; + maintainers = with maintainers; [ muscaln ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/qdl/default.nix b/pkgs/tools/misc/qdl/default.nix index 79b9cec2ed5..e00b4f352e8 100644 --- a/pkgs/tools/misc/qdl/default.nix +++ b/pkgs/tools/misc/qdl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { homepage = "https://github.com/andersson/qdl"; description = "Tool for flashing images to Qualcomm devices"; license = licenses.bsd3; - maintainers = with maintainers; [ musfay ]; + maintainers = with maintainers; [ muscaln ]; platforms = platforms.linux; }; } From b8f84c3d182854430909419f4ed8ab0d0fa22858 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 9 May 2022 21:07:43 +0200 Subject: [PATCH 10/13] python3Packages.eventlet: disable failing test Only for aarch64. It's failing on aarch64: https://hydra.nixos.org/build/176121677/nixlog/2 Unclear if it's an actual failure or not, but disabling should help downstream packages to build again. --- pkgs/development/python-modules/eventlet/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 096279b3453..d24874ac591 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -59,6 +59,8 @@ buildPythonPackage rec { "test_patcher_existing_locks_locked" # broken with pyopenssl 22.0.0 "test_sendall_timeout" + ] ++ lib.optionals stdenv.isAarch64 [ + "test_fork_after_monkey_patch" ]; disabledTestPaths = [ From d652974d1a645c504abb65ee5e85d11e738df936 Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 10 May 2022 22:34:02 +0200 Subject: [PATCH 11/13] python3Packages.sanic: fix build on aarch64 (#172155) Co-authored-by: Sandro --- pkgs/development/python-modules/sanic/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 91d8c564315..228bf2a5624 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { format = "setuptools"; disabled = pythonOlder "3.7" || - pythonAtLeast "3.10"; # see GHSA-7p79-6x2v-5h88 + pythonAtLeast "3.10"; # see GHSA-7p79-6x2v-5h88 src = fetchFromGitHub { owner = "sanic-org"; @@ -125,6 +125,13 @@ buildPythonPackage rec { "test_raw_headers" # noisy_exceptions sometimes missing from sanic stdout "test_noisy_exceptions" + ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + # test fail on aarch64 + "test_tls_wrong_options" + "test_cookie_expires" + "test_gunicorn_worker" + "test_gunicorn_worker_no_logs" + "test_gunicorn_worker_with_logs" ]; disabledTestPaths = [ From eee661ba01f05f5b2b9b5527df0643ef8f4b024f Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Tue, 10 May 2022 14:38:56 -0600 Subject: [PATCH 12/13] vyper: relax semantic-version dependency --- pkgs/development/compilers/vyper/default.nix | 32 +++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index e4ad7fe5f7f..518b230c838 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -1,6 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, writeText, asttokens -, pycryptodome, pytest-xdist, pytest-cov, recommonmark, semantic-version, sphinx -, sphinx_rtd_theme, pytest-runner, setuptools-scm }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pythonAtLeast +, pythonRelaxDepsHook +, writeText +, asttokens +, pycryptodome +, recommonmark +, semantic-version +, sphinx +, sphinx_rtd_theme +, pytest-runner +, setuptools-scm +}: let sample-contract = writeText "example.vy" '' @@ -10,18 +23,27 @@ let def __init__(foo: address): self.count = 1 ''; -in +in buildPythonPackage rec { pname = "vyper"; version = "0.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7" || pythonAtLeast "3.10"; src = fetchPypi { inherit pname version; sha256 = "sha256-fXug5v3zstz19uexMWokHBVsfcl2ZCdIOIXKeLVyh/Q="; }; - nativeBuildInputs = [ pytest-runner setuptools-scm ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + pytest-runner + setuptools-scm + ]; + + pythonRelaxDeps = [ "semantic-version" ]; propagatedBuildInputs = [ asttokens From 6951b5c187bbf43830ef49a6f37db45882edebba Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 10 May 2022 22:47:16 +0200 Subject: [PATCH 13/13] hydra-unstable: drop TestMore, which is an alias for `null` --- pkgs/development/tools/misc/hydra/common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index 9edafd493ae..2b0775afc37 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -81,7 +81,6 @@ let TermSizeAny TermReadKey Test2Harness - TestMore TestPostgreSQL TextDiff TextTable