From ab1399db21cdcb56a0257bdfb451aeabbe2caa77 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 27 Oct 2022 00:54:36 +0200 Subject: [PATCH 01/43] hydrus: 503 -> 504 --- pkgs/applications/graphics/hydrus/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 2bce94d52d8..51095768a31 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "503"; + version = "504"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-nJn5EphbmVYAAOisV3fym/nHlJl/aPZ2Iyp+Z2/N3Jc="; + hash = "sha256-d9GxAUbdtKzyQI7ow8Cx0e0TCDchasSZL450+9GhJAU="; }; nativeBuildInputs = [ @@ -82,6 +82,7 @@ python3Packages.buildPythonPackage rec { -e TestHydrusServer \ -e TestHydrusSessions \ -e TestServer \ + -e TestClientMetadataMigration \ ''; outputs = [ "out" "doc" ]; From 87e5f355234f2e10ebaa70af702a39647236d52a Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 10 Nov 2022 00:36:58 +0100 Subject: [PATCH 02/43] hydrus: 504 -> 505b --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 51095768a31..a9baf07e8c9 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "504"; + version = "505b"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-d9GxAUbdtKzyQI7ow8Cx0e0TCDchasSZL450+9GhJAU="; + hash = "sha256-mnZ5dz8E3wtuXtGgoCKE2YkwrCiLNPaTROCqaiRGFNY="; }; nativeBuildInputs = [ From c31a31f1692221013f6b7f831fa9c0c62ce228dd Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 24 Nov 2022 12:58:01 +0100 Subject: [PATCH 03/43] hydrus: 505b -> 507 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index a9baf07e8c9..7d6695511f1 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "505b"; + version = "507"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-mnZ5dz8E3wtuXtGgoCKE2YkwrCiLNPaTROCqaiRGFNY="; + hash = "sha256-0WFvW9euafDMnS3vwUSMmJcaaAXIIgQZ4H/VdqCao+E="; }; nativeBuildInputs = [ From bcdf1ccfdd8637c9cee38bc32bbe7f3ecb899580 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 1 Dec 2022 15:27:25 +0100 Subject: [PATCH 04/43] hydrus: 507 -> 508 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 7d6695511f1..512a5aefd12 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "507"; + version = "508"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-0WFvW9euafDMnS3vwUSMmJcaaAXIIgQZ4H/VdqCao+E="; + hash = "sha256-8t7xW8mAmHb/VNuxhgOUNAcDH6UD8SSTEo2Pk5oosro="; }; nativeBuildInputs = [ From 1a266392410e45427df3a36dd85ce594e3d41fe0 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 8 Dec 2022 00:49:05 +0100 Subject: [PATCH 05/43] hydrus: 508 -> 509 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 512a5aefd12..bd11b6108b5 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "508"; + version = "509"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-8t7xW8mAmHb/VNuxhgOUNAcDH6UD8SSTEo2Pk5oosro="; + hash = "sha256-5dHP9+leymD6fLjT96CR4DwAILR7jRspAo2an4fnBbw="; }; nativeBuildInputs = [ From 2b08598b4a8ef3efdba405daee9e77a8a6c2d20a Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 9 Dec 2022 00:34:02 +0100 Subject: [PATCH 06/43] pyqt6-charts: init at 6.4.0 --- .../python-modules/pyqt6-charts.nix | 77 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/development/python-modules/pyqt6-charts.nix diff --git a/pkgs/development/python-modules/pyqt6-charts.nix b/pkgs/development/python-modules/pyqt6-charts.nix new file mode 100644 index 00000000000..66df9bbf0fb --- /dev/null +++ b/pkgs/development/python-modules/pyqt6-charts.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sip +, pyqt-builder +, qt6Packages +, pythonOlder +, pyqt6 +, python +}: + +buildPythonPackage rec { + pname = "PyQt6_Charts"; + version = "6.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-tG6xKEBRagOcNvcLs/hCMzf5j94ma1gs6tQEm3e0P2Q="; + }; + + # fix include path and increase verbosity + postPatch = '' + sed -i \ + '/\[tool.sip.project\]/a\ + verbose = true\ + sip-include-dirs = [\"${pyqt6}/${python.sitePackages}/PyQt6/bindings\"]' \ + pyproject.toml + ''; + + enableParallelBuilding = true; + # HACK: paralellize compilation of make calls within pyqt's setup.py + # pkgs/stdenv/generic/setup.sh doesn't set this for us because + # make gets called by python code and not its build phase + # format=pyproject means the pip-build-hook hook gets used to build this project + # pkgs/development/interpreters/python/hooks/pip-build-hook.sh + # does not use the enableParallelBuilding flag + preBuild = '' + export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}" + ''; + + dontWrapQtApps = true; + + nativeBuildInputs = with qt6Packages; [ + qtcharts + sip + qmake + pyqt-builder + ]; + + buildInputs = with qt6Packages; [ + qtcharts + ]; + + propagatedBuildInputs = [ + pyqt6 + ]; + + dontConfigure = true; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ + "PyQt6.QtCharts" + ]; + + meta = with lib; { + description = "Python bindings for Qt6 QtCharts"; + homepage = "https://riverbankcomputing.com/"; + license = licenses.gpl3Only; + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 224684bc1fa..769c53d3b4a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8545,6 +8545,8 @@ self: super: with self; { pyqt6 = callPackage ../development/python-modules/pyqt/6.x.nix { }; + pyqt6-charts = callPackage ../development/python-modules/pyqt6-charts.nix { }; + pyqt6-sip = callPackage ../development/python-modules/pyqt/pyqt6-sip.nix { }; pyqt6-webengine = callPackage ../development/python-modules/pyqt6-webengine.nix { }; From b94f337eee200767632ccfd264a83e6262d8f74f Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 9 Dec 2022 00:43:04 +0100 Subject: [PATCH 07/43] hydrus: switch to qt6 --- pkgs/applications/graphics/hydrus/default.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index bd11b6108b5..60e757d4b55 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -6,6 +6,8 @@ , enableSwftools ? false , swftools , python3Packages +, qtbase +, qtcharts }: python3Packages.buildPythonPackage rec { @@ -25,6 +27,11 @@ python3Packages.buildPythonPackage rec { python3Packages.mkdocs-material ]; + buildInputs = [ + qtbase + qtcharts + ]; + propagatedBuildInputs = with python3Packages; [ beautifulsoup4 cbor2 @@ -38,7 +45,8 @@ python3Packages.buildPythonPackage rec { pillow psutil pyopenssl - pyside2 + pyqt6 + pyqt6-charts pysocks python-dateutil python3Packages.mpv diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7460655d7f4..f3a23af11bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29446,7 +29446,7 @@ with pkgs; hydrus = python3Packages.callPackage ../applications/graphics/hydrus { inherit miniupnpc swftools; - inherit (qt5) wrapQtAppsHook; + inherit (qt6) wrapQtAppsHook qtbase qtcharts; }; jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains { From b0e228f88dac5011a7eeb11f6f48d6c402b2d4bf Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 15 Dec 2022 14:48:17 +0100 Subject: [PATCH 08/43] hydrus: 509 -> 510 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 60e757d4b55..c41c802e529 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "509"; + version = "510"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-5dHP9+leymD6fLjT96CR4DwAILR7jRspAo2an4fnBbw="; + hash = "sha256-g5bVsc0c9CqIHzIW6oFjmp8bvZ5b9Ng55cAo3sjzw3k="; }; nativeBuildInputs = [ From c29a4f91d8b88fc0d9deb6028a67e739878aca55 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Tue, 20 Dec 2022 01:41:32 +0100 Subject: [PATCH 09/43] hydrus: 510 -> 510a --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index c41c802e529..c2f5a250eac 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "510"; + version = "510a"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-g5bVsc0c9CqIHzIW6oFjmp8bvZ5b9Ng55cAo3sjzw3k="; + hash = "sha256-nOxOeuIVGkqnfkGe/SFQEhEk6VJ392VqdC9gH/9Ff3Q="; }; nativeBuildInputs = [ From ef84d20b3199552c4bbac62f4cb71b9bfe5fc61c Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 22 Dec 2022 00:12:56 +0100 Subject: [PATCH 10/43] hydrus: 510a -> 511 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index c2f5a250eac..a85f0df32ff 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "510a"; + version = "511"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-nOxOeuIVGkqnfkGe/SFQEhEk6VJ392VqdC9gH/9Ff3Q="; + hash = "sha256-/3bGh1qFBEzVoObLMn3g6jdqujnCBI8ZUQMTM0YeeLQ="; }; nativeBuildInputs = [ From aa0b988d7b08d7c2037040a08ab7fc33593ca416 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 5 Jan 2023 21:09:03 +0100 Subject: [PATCH 11/43] hydrus: 511 -> 512 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index a85f0df32ff..cc923b5ca98 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "511"; + version = "512"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-/3bGh1qFBEzVoObLMn3g6jdqujnCBI8ZUQMTM0YeeLQ="; + hash = "sha256-XP9xeJLCwct5q1+3R5xlx4RXAwZe3TY/XkcSjhuK99U="; }; nativeBuildInputs = [ From f68e795cd5fc3dc1da7b3700ae6e513353eef455 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Mon, 16 Jan 2023 01:23:26 +0100 Subject: [PATCH 12/43] hydrus: 512 -> 513 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index cc923b5ca98..9ed196ad444 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "512"; + version = "513"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-XP9xeJLCwct5q1+3R5xlx4RXAwZe3TY/XkcSjhuK99U="; + hash = "sha256-SY+IjK05DLThU2nNJ6Hp6DjmAFEjguxbYcxkWpmHi7w="; }; nativeBuildInputs = [ From e74c9e5466c21e5848c6fd1cdefce936a5f9147b Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 26 Jan 2023 07:40:40 +0100 Subject: [PATCH 13/43] hydrus: 513 -> 514 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 9ed196ad444..0fc5f9e8965 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "513"; + version = "514"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-SY+IjK05DLThU2nNJ6Hp6DjmAFEjguxbYcxkWpmHi7w="; + hash = "sha256-7Ialm8+yHz51+E8td0xwhcq+woF8uxroa9QUHg3HALc="; }; nativeBuildInputs = [ From 62957815336742f13840d936e5d37859912fd962 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 2 Feb 2023 14:31:38 +0100 Subject: [PATCH 14/43] hydrus: 514 -> 515 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 0fc5f9e8965..f1f8394b9c0 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "514"; + version = "515"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-7Ialm8+yHz51+E8td0xwhcq+woF8uxroa9QUHg3HALc="; + hash = "sha256-2V9FGwq7mkr3N4Fghq8JI2WvDKQeadVU1C8ggXzyEQM="; }; nativeBuildInputs = [ From a0a0ce54a0e77e39c7dae987683cd7aef10d5549 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 9 Feb 2023 05:26:46 +0100 Subject: [PATCH 15/43] hydrus: 515 -> 516 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index f1f8394b9c0..26ded138123 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "515"; + version = "516"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-2V9FGwq7mkr3N4Fghq8JI2WvDKQeadVU1C8ggXzyEQM="; + hash = "sha256-1sjHPOkbfvmtDSSyv04S47LsQZ/fcJoGuK8c64RZy8Y="; }; nativeBuildInputs = [ From 2f29e3223bc3bb6cc495565a22d06b3f40d98aca Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Wed, 15 Feb 2023 23:08:26 +0100 Subject: [PATCH 16/43] hydrus: 516 -> 517 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 26ded138123..42e396d531a 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "516"; + version = "517"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-1sjHPOkbfvmtDSSyv04S47LsQZ/fcJoGuK8c64RZy8Y="; + hash = "sha256-YTphPBwOVnCkCxrUe7ISZryVjbbZbBe7IFkrMij1s1w="; }; nativeBuildInputs = [ From 59e6109377e101eb3c220f22ec94c781ad1059fc Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 23 Feb 2023 02:15:46 +0100 Subject: [PATCH 17/43] hydrus: 517 -> 518 --- pkgs/applications/graphics/hydrus/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 42e396d531a..b4aad201288 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "517"; + version = "518"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-YTphPBwOVnCkCxrUe7ISZryVjbbZbBe7IFkrMij1s1w="; + hash = "sha256-DdzRi2Yw5epblN5oLpuwuvmidrbr2EBm1ocsWrNiDRk="; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ python3Packages.buildPythonPackage rec { opencv4 pillow psutil + pympler pyopenssl pyqt6 pyqt6-charts From e09b49e6715edadc53aeaec3a3da36ff709d5b03 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Thu, 9 Mar 2023 21:38:27 -0600 Subject: [PATCH 18/43] =?UTF-8?q?signal-desktop:=206.7.0=20=E2=86=92=206.9?= =?UTF-8?q?.0,=20signal-desktop-beta:=206.8.0-beta.1=20=E2=86=92=206.10.0-?= =?UTF-8?q?beta.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../instant-messengers/signal-desktop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 22d07183886..9fda9d0ec48 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.7.0"; - hash = "sha256-njiVPTkzYdt7QZcpohXUI3hj/o+fO4/O0ZlQrq2oP6Y="; + version = "6.9.0"; + hash = "sha256-VgEGFt8LvVpIWiqFyYiTXUavYY0YmnJ+CxrNhPP0hCg="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.8.0-beta.1"; - hash = "sha256-akQmGxDW6SBQCRLU6TgfODP8ZjEPsvaBvrkdd+6DqKs="; + version = "6.10.0-beta.1"; + hash = "sha256-A8jpYDWiCCBadRDzmNVxzucKPomgXlqdyeGiYp+1Byo="; }; } From ff344b6016de0897cc8b628f5627c79114034750 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 12 Mar 2023 12:57:06 +0100 Subject: [PATCH 19/43] hydrus: 518 -> 519 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index b4aad201288..d5d04c610db 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "518"; + version = "519"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-DdzRi2Yw5epblN5oLpuwuvmidrbr2EBm1ocsWrNiDRk="; + hash = "sha256-q5pPRMBuB6hqDGuOl0kMyXjMKze5dw+3kdmA2FPJTPU="; }; nativeBuildInputs = [ From bb86a3aabf0da4283eea31d55557c7def50cba94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Mar 2023 04:16:17 +0000 Subject: [PATCH 20/43] spotify-player: 0.12.0 -> 0.12.1 --- pkgs/applications/audio/spotify-player/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index 2330d9c2797..4dc885b720f 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nWXXaRHTzCXmu4eKw88pKuWXgdG9n7azPeBbXYz+Fio="; + sha256 = "sha256-KHbeCnsdHP7Zsj9KeVLuumcVOW6m7Tz1GgBBQ25Rbyo="; }; - cargoHash = "sha256-y/qHiwZes4nVtjbFN/jL2LFugGpRKnYij7+XXZbqguQ="; + cargoHash = "sha256-51xKCiGdvJ8k9ArWBCazJGgRljqHxZiyTdes4i7JZH8="; nativeBuildInputs = [ pkg-config From 052ed0d094c2c993820b4a83a61a380fe9459f00 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 14 Mar 2023 04:20:00 +0000 Subject: [PATCH 21/43] python310Packages.jupyter-book: 0.15.0 -> 0.15.1 https://github.com/executablebooks/jupyter-book/releases/tag/v0.15.1 --- pkgs/development/python-modules/jupyter-book/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 6cee08d8671..5c660c0a907 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "jupyter-book"; - version = "0.15.0"; + version = "0.15.1"; format = "flit"; @@ -34,7 +34,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-eUw3zC+6kx/OQvMhzkG6R3b2ricX0kvC+fCBD4mkEuo="; + sha256 = "sha256-ihY07Bb37t7g0Rbx5ft8SCAyia2S2kLglRnccdlWwBA="; }; nativeBuildInputs = [ From 8772d85b025c6db64461879cd4d1bab405a9abe1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 14 Mar 2023 04:20:00 +0000 Subject: [PATCH 22/43] terracognita: 0.8.2 -> 0.8.3 https://github.com/cycloidio/terracognita/releases/tag/v0.8.3 --- pkgs/development/tools/misc/terracognita/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index 6734b4fd858..26f3b86326d 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terracognita"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OzqIUnvWVxaUAWRIKDWaxtmTeFGqvVYAgdbG4jrph7w="; + hash = "sha256-ipPJMh88R9Ddo1QzN+No9H2bBsLSPARUI2HRaYvK6jc="; }; - vendorHash = "sha256-LzkxVxqBJ3pRk3EI+/Lc6XSNyxhPUg61GKwI1Kmadsc="; + vendorHash = "sha256-7fGqChud9dcgA9BXyJysUgvvG7zI+ByA0oFlSMd+rps="; doCheck = false; From 50982761c03b5d4caccfe096919dabcdbae7f832 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 14 Mar 2023 04:20:00 +0000 Subject: [PATCH 23/43] nodejs-19_x: 19.7.0 -> 19.8.0 https://github.com/nodejs/node/releases/tag/v19.8.0 --- pkgs/development/web/nodejs/v19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v19.nix b/pkgs/development/web/nodejs/v19.nix index 5921c2a4e69..5def8607219 100644 --- a/pkgs/development/web/nodejs/v19.nix +++ b/pkgs/development/web/nodejs/v19.nix @@ -9,8 +9,8 @@ let in buildNodejs { inherit enableNpm; - version = "19.7.0"; - sha256 = "sha256-URhH9yTqQF+F4lgDy8+LExsUzQay1wRmmL0nYMQEv8M="; + version = "19.8.0"; + sha256 = "sha256-O3wH4ngJIHGMGsfSS2czXwSN2cPdaVaR9B2oD06jSaY="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch From ee9bccda674c5d02ea3dc1baba611eae095e35b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Mar 2023 04:47:42 +0000 Subject: [PATCH 24/43] go-task: 3.21.0 -> 3.22.0 --- pkgs/development/tools/go-task/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index e52c36cf397..4635f1618d1 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.21.0"; + version = "3.22.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-w46fCcUKMtmiFVSMSzgsegWBZUcTaMgOkhu9HnfYHf4="; + sha256 = "sha256-SmO59VXuQZISDNJy2d6qhQv1QCxm0WodqPx2qHhCs80="; }; - vendorHash = "sha256-YC2C0/ayl0Rp8brzLLcdLB98BmhH7sP7EzLVdOIGAvQ="; + vendorHash = "sha256-TsFPpN/X5pO4KALbqsHCa6YxYtaXMVqB5ENaIEfTWRo="; doCheck = false; From 32cb1a48b68e5b28aa32217cdad2646aacd9735e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Mar 2023 09:19:41 +0100 Subject: [PATCH 25/43] go-task: add changelog to meta --- pkgs/development/tools/go-task/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 4635f1618d1..719743c076d 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -7,8 +7,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = pname; repo = "task"; - rev = "v${version}"; - sha256 = "sha256-SmO59VXuQZISDNJy2d6qhQv1QCxm0WodqPx2qHhCs80="; + rev = "refs/tags/v${version}"; + hash = "sha256-SmO59VXuQZISDNJy2d6qhQv1QCxm0WodqPx2qHhCs80="; }; vendorHash = "sha256-TsFPpN/X5pO4KALbqsHCa6YxYtaXMVqB5ENaIEfTWRo="; @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://taskfile.dev/"; description = "A task runner / simpler Make alternative written in Go"; + changelog = "https://github.com/go-task/task/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ parasrah ]; }; From fccc21ef3db5c088cde36e216e8432e8d3474bd3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Mar 2023 09:21:21 +0100 Subject: [PATCH 26/43] spotify-player: add changelog to emta --- pkgs/applications/audio/spotify-player/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index 4dc885b720f..df4cf7af494 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -16,8 +16,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "aome510"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-KHbeCnsdHP7Zsj9KeVLuumcVOW6m7Tz1GgBBQ25Rbyo="; + rev = "refs/tags/v${version}"; + hash = "sha256-KHbeCnsdHP7Zsj9KeVLuumcVOW6m7Tz1GgBBQ25Rbyo="; }; cargoHash = "sha256-51xKCiGdvJ8k9ArWBCazJGgRljqHxZiyTdes4i7JZH8="; @@ -46,6 +46,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A command driven spotify player"; homepage = "https://github.com/aome510/spotify-player"; + changelog = "https://github.com/aome510/spotify-player/releases/tag/v${version}"; mainProgram = "spotify_player"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; From c4ca4fa7f3caa4ed7cdb4133a24adabad42ac0a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Mar 2023 12:01:52 +0000 Subject: [PATCH 27/43] python310Packages.flask-security-too: 5.1.1 -> 5.1.2 --- .../development/python-modules/flask-security-too/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index 638199020a3..c63b99161a9 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "5.1.1"; + version = "5.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -54,7 +54,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - hash = "sha256-CgtlPP0cXSUplL2HsfESQxzsLVys7fpJs24XQNohw30="; + hash = "sha256-lZzm43m30y+2qjxNddFEeg9HDlQP9afq5VtuR25zaLc="; }; propagatedBuildInputs = [ From b209a99de6ee4deff49f4ff8ef41740c73a61df5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Mar 2023 00:59:51 +0100 Subject: [PATCH 28/43] python310Packages.devolo-home-control-api: 0.18.2 -> 0.18.3 Diff: https://github.com/2Fake/devolo_home_control_api/compare/v0.18.2...v0.18.3 --- .../python-modules/devolo-home-control-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix index 737ec13ad64..558f114761f 100644 --- a/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "devolo-home-control-api"; - version = "0.18.2"; + version = "0.18.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "2Fake"; repo = "devolo_home_control_api"; rev = "v${version}"; - sha256 = "sha256-H4kLomHM0qq6LqsRMEp34oKy/4Me7AQi6dij2vraBS8="; + sha256 = "sha256-4AyC1DDYtKl8SwJf75BbzoOAhbZXmBZ05ma9YmLzksM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 92d0a0f9ff55ca1148f0ecb20ca1d6c916cb79e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Mar 2023 01:00:32 +0100 Subject: [PATCH 29/43] python310Packages.archinfo: 9.2.41 -> 9.2.42 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 9042269a465..eca1ca45248 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.41"; + version = "9.2.42"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-O2Tj5rwev5tWnaHq/GJV5/9fAlk5np7S3Yw+ehmofks="; + hash = "sha256-jDC4nmHg7OCo7mQ7iLeG7OFB1xAQxkKw1WZTyY2FBoY="; }; nativeBuildInputs = [ From 1ff6a88a51be1ccc715766fda527194287a77f0e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Mar 2023 01:00:35 +0100 Subject: [PATCH 30/43] python310Packages.ailment: 9.2.41 -> 9.2.42 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 0bcd1360e29..0f1163d184f 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.41"; + version = "9.2.42"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-KXbHD0CsQotHjc/Pbo4/y/uhCvGkbPDGn1BF8A68xBY="; + hash = "sha256-45wEnYx2/XvyVlew8rwPFSHZtj6NdZWPEEomkqBLNIw="; }; nativeBuildInputs = [ From 7781338eb880b1d3b1ee3732b6fb16630dca7c6f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Mar 2023 01:00:39 +0100 Subject: [PATCH 31/43] python310Packages.pyvex: 9.2.41 -> 9.2.42 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 2b4afb7802c..8c1290c40eb 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.41"; + version = "9.2.42"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NYNxuWvAvx5IW1gdWv+EF321yzUPaqFBRNKVwu4ogug="; + hash = "sha256-5pp66sI15sdavyZD+xrTFqhAgjT89KswBE0MQ09Fdl4="; }; nativeBuildInputs = [ From d2d1dc9b5b556fa4ea3b70380637609628e0c173 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Mar 2023 01:00:43 +0100 Subject: [PATCH 32/43] python310Packages.claripy: 9.2.41 -> 9.2.42 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 6f90b5b51ea..b955773143a 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.41"; + version = "9.2.42"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FX73LF8T6FaQNqN7EB1SCRAGZsChkEduNL2i8ATQuOE="; + hash = "sha256-94FEyPL9zjHBFC8L/Aij8OcS5GiBBEY1Tnm4N7zNW0g="; }; nativeBuildInputs = [ From 8126e66d934777d018b47e347509db5c9b565630 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Mar 2023 01:00:46 +0100 Subject: [PATCH 33/43] python310Packages.cle: 9.2.41 -> 9.2.42 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index b9712c2a827..fc185cf3cdd 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.41"; + version = "9.2.42"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-v87ma0svBpVfx2SVLw8dx7HdOLQpNzjRwVj9yQs0bR8="; + hash = "sha256-NZPXpL4bnPXJHIPf+Jwt6vE7G43JAjhZhW2xeNSw3R8="; }; nativeBuildInputs = [ From d063984a3c63286c61587ab7f7af996a60fd1769 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Mar 2023 01:00:51 +0100 Subject: [PATCH 34/43] python310Packages.angr: 9.2.41 -> 9.2.42 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 9997ab09fd4..d726a0a27af 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.41"; + version = "9.2.42"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-HikfqU2k7w/IO51vOKNzCLWd+MphG1hXkJal5usQZOA="; + hash = "sha256-EbOGAY7aqpWngy8ImdDt8dmJhc1UEiX0I8KY8TSump0="; }; propagatedBuildInputs = [ From 487240c891a43679ef04f033b55c04df6966d909 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Mar 2023 01:08:07 +0100 Subject: [PATCH 35/43] checkov: 2.3.85 -> 2.3.92 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.3.85...2.3.92 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.3.92 --- pkgs/development/tools/analysis/checkov/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 9bbc58abb61..b287cb7e7b5 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.85"; + version = "2.3.92"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-j//r9ykMCzmpPBAPmfZCMlvcv7jrFaT+fFsLZoOeQF4="; + hash = "sha256-7Mr9mWnUuxfGJZVx845JHtIbWZeWStY/xbWUVjOcksM="; }; patches = [ @@ -113,6 +113,8 @@ buildPythonApplication rec { # Tests are comparing console output "cli" "console" + # Starting to fail after 2.3.92 + "test_runner_verify_secrets_skip" ]; disabledTestPaths = [ From 26da1c1ba8ee976cd7bed0d9e93908e7ca37e552 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Mar 2023 04:23:08 +0000 Subject: [PATCH 36/43] chezmoi: 2.31.1 -> 2.32.0 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index c6a5f9aafe8..834110a6aaa 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.31.1"; + version = "2.32.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-zSr4lvrrGM+BgPWtq/J7vnB1lWHI8PmqP/N5csFL9kU="; + hash = "sha256-ljzcB48AeYMbo3GjsegJS7eyIRnd+prHBtK4dAICOCY="; }; - vendorHash = "sha256-/CGdz6wIpEZrhZe6IYa43Z3bpN1byeSi9h4dTxCMxog="; + vendorHash = "sha256-Ugp3jvtV12Ss7HdhLkBSdENyOTSb573iho1u2UX5Img="; doCheck = false; From 4a2b772a553159bc21527aaa16da94fc804879c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Mar 2023 06:59:46 +0000 Subject: [PATCH 37/43] python310Packages.plexapi: 4.13.2 -> 4.13.4 --- pkgs/development/python-modules/plexapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 88f3fb89a81..7ca7e075ea1 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.13.2"; + version = "4.13.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-5YwINPgQ4efZBvu5McsLYicW/7keKSi011lthJUR9zw="; + hash = "sha256-yq1tQ6xJn+IxrKXwUVeLhki6sdkwzu9hHSILsLJdPPY="; }; propagatedBuildInputs = [ From 3565cf6b8c790b109d7933480073b15827858325 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 15 Mar 2023 09:25:13 +0200 Subject: [PATCH 38/43] Revert "shadowsocks-v2ray-plugin: 1.3.1 -> 1.3.2" --- pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix index e6f715c6c10..1642bb2944d 100644 --- a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix +++ b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "shadowsocks-v2ray-plugin"; - version = "1.3.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "shadowsocks"; repo = "v2ray-plugin"; rev = "v${version}"; - sha256 = "sha256-sGsGdJp20mXvJ6Ov1QjztbJxNpDaDEERcRAAyGgenVk="; + sha256 = "0aq445gnqk9dxs1hkw7rvk86wg0iyiy0h740lvyh6d9zsqhf61wb"; }; - vendorHash = "sha256-vW8790Z4BacbdqANWO41l5bH5ac/TSZIdVNvOFVTsZ8="; + vendorSha256 = "0vzd9v33p4a32f5ic9ir4g5ckis06wpdf07a649h9qalimxnvzfz"; meta = with lib; { description = "Yet another SIP003 plugin for shadowsocks, based on v2ray"; From efcc5e13f05385206e3143cd298deeac4015fe73 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 15 Mar 2023 09:30:44 +0200 Subject: [PATCH 39/43] shadowsocks-v2ray-plugin: no auto update --- pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix index 1642bb2944d..b4225213651 100644 --- a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix +++ b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix @@ -3,6 +3,7 @@ buildGoModule rec { pname = "shadowsocks-v2ray-plugin"; version = "1.3.1"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "shadowsocks"; From 102bed5081efeb8d3045aab6a8ae5707276a6dd4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 15 Mar 2023 09:58:20 +0200 Subject: [PATCH 40/43] shadowsocks-v2ray-plugin: add comments about no auto update --- pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix index b4225213651..24aaebe9d02 100644 --- a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix +++ b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix @@ -3,6 +3,9 @@ buildGoModule rec { pname = "shadowsocks-v2ray-plugin"; version = "1.3.1"; + # Version 1.3.2 has runtime failures with Go 1.19 + # https://github.com/NixOS/nixpkgs/issues/219343 + # https://github.com/shadowsocks/v2ray-plugin/issues/292 # nixpkgs-update: no auto update src = fetchFromGitHub { From 73bc86dc9c8d16da05dad1f94a56c95d4431a303 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 7 Mar 2023 20:41:09 +0100 Subject: [PATCH 41/43] coqPackages.coq-ext-lib: enable for Coq 8.17 --- pkgs/development/coq-modules/coq-ext-lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index d555e55389b..8991787873f 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation rec { owner = "coq-ext-lib"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.11" "8.16"; out = "0.11.7"; } + { case = range "8.11" "8.17"; out = "0.11.7"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } { case = range "8.8" "8.13"; out = "0.11.3"; } From 265f0cae7528e0b5aa109f16f6c2c6c3c5290092 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 7 Mar 2023 20:41:36 +0100 Subject: [PATCH 42/43] coqPackages.paco: enable for Coq 8.17 --- pkgs/development/coq-modules/paco/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index e9163c16132..cbc947092ab 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "snu-sf"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.12" "8.16"; out = "4.1.2"; } + { case = range "8.12" "8.17"; out = "4.1.2"; } { case = range "8.9" "8.13"; out = "4.1.1"; } { case = range "8.6" "8.13"; out = "4.0.2"; } { case = isEq "8.5"; out = "1.2.8"; } From 9d8a066fd49dbd026e9b6c02c71a7d221e47e84e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 7 Mar 2023 20:41:55 +0100 Subject: [PATCH 43/43] =?UTF-8?q?coqPackages.ITree:=204.0.0=20=E2=86=92=20?= =?UTF-8?q?5.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/ITree/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index e0a9e1f6bfc..ae43722a5e6 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -5,8 +5,10 @@ mkCoqDerivation rec { owner = "DeepSpec"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.13" "8.17"; out = "5.1.0"; } { case = range "8.10" "8.16"; out = "4.0.0"; } ] null; + release."5.1.0".sha256 = "sha256-ny7Mi1KgWADiFznkNJiRgD7Djc5SUclNgKOmWRxK+eo="; release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm"; releaseRev = v: "${v}"; propagatedBuildInputs = [ coq-ext-lib paco ];