From 266f40a5ccf5ce7ab6b211c42cb237c1be2493b2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 1 May 2024 22:04:05 +0100 Subject: [PATCH 001/111] man-pages: restore `$out/bin` to fix `nix-shell -p man-pages` `man 5 manpath` says that `PATH` is a default variable used to populate manpages search path. Without the change the following session does not work: $ nix-shell -p man-pages $$ man x25 No manual entry for x25 Reported in https://github.com/NixOS/nixpkgs/pull/300797#issuecomment-2088956037 --- pkgs/data/documentation/man-pages/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index deb6a4005f66..3bb5c3b1d18c 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -21,6 +21,14 @@ stdenv.mkDerivation rec { enableParallelInstalling = true; + postInstall = '' + # The manpath executable looks up manpages from PATH. And this package won't + # appear in PATH unless it has a /bin folder. Without the change + # 'nix-shell -p man-pages' does not pull in the search paths. + # See 'man 5 manpath' for the lookup order. + mkdir -p $out/bin + ''; + meta = with lib; { description = "Linux development manual pages"; homepage = "https://www.kernel.org/doc/man-pages/"; From 8a9a1e6369d83265d9a21dc62ced894b3e08edb4 Mon Sep 17 00:00:00 2001 From: Cobalt Date: Thu, 2 May 2024 20:27:36 +0200 Subject: [PATCH 002/111] nodejs_22: 22.0.0 -> 22.1.0 Update to current nodejs 22.1.0 release. This release notably include a node compile cache and multiple bug fixes. Release note: https://github.com/nodejs/node/releases/tag/v22.1.0 --- pkgs/development/web/nodejs/v22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index a72f22b6f498..63736088b5f1 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "22.0.0"; - sha256 = "sha256-IuKPv/MfaQc7gCTLQnReUQX4QEHzR1smC5fVoUEDnRo="; + version = "22.1.0"; + sha256 = "sha256-nX1fQNnb1iYMmbXklLX5vHVejw/6xw4SGtzl+0QvI8s="; patches = [ ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch From 07d12f14d5d920c12651a73591a41cd69b0547fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 May 2024 21:21:03 +0000 Subject: [PATCH 003/111] python311Packages.line-profiler: 4.1.2 -> 4.1.3 --- pkgs/development/python-modules/line-profiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index 73fa920139de..85d8cdf8d8af 100644 --- a/pkgs/development/python-modules/line-profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "line-profiler"; - version = "4.1.2"; + version = "4.1.3"; format = "setuptools"; disabled = pythonOlder "3.6" || isPyPy; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "line_profiler"; inherit version; - hash = "sha256-qlZXiw/1p1b+GAs/2nvWfCe71Hiz0BJGEtjPAOSiHfI="; + hash = "sha256-5fESPDZywyGLoGPCO9ZKURWeRGSf7WeAuZPHgfte0xg="; }; nativeBuildInputs = [ From 45e6042fd50e7ce720ce82f664dceba911c598a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 May 2024 21:32:22 +0000 Subject: [PATCH 004/111] python311Packages.pymatgen: 2024.4.13 -> 2024.5.1 --- pkgs/development/python-modules/pymatgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 59981da7e780..5547279c0654 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2024.4.13"; + version = "2024.5.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "materialsproject"; repo = "pymatgen"; rev = "refs/tags/v${version}"; - hash = "sha256-vjasWQgwjtoM/6Y1HwK1otMFejRWEj+YBxaIYDDSeeo="; + hash = "sha256-ZMOZ4eFtIaIcBPGT6bgAV+47LEGWAAnF/ml68j0fXws="; }; build-system = [ setuptools ]; From 40698337b327cd7603af12a00708d1137bcdd73d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 May 2024 03:52:28 +0000 Subject: [PATCH 005/111] python311Packages.niaaml: 1.2.0 -> 2.0.0 --- pkgs/development/python-modules/niaaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix index 855908721490..d2b9868cacac 100644 --- a/pkgs/development/python-modules/niaaml/default.nix +++ b/pkgs/development/python-modules/niaaml/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "niaaml"; - version = "1.2.0"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "lukapecnik"; repo = "NiaAML"; rev = "refs/tags/${version}"; - hash = "sha256-jGbsxYlRJ81g74LqSKpquciPsLP+KSoNBTJPEaD/CHM="; + hash = "sha256-d6UlpMrT0GBZlcD1BCZxInXTdyFMBVltxnSyUFbSy0g="; }; pythonRelaxDeps = [ From fe7232a5914df8386df6ad9992ceb2aa69277d64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 May 2024 04:12:12 +0000 Subject: [PATCH 006/111] python311Packages.phonopy: 2.22.1 -> 2.23.1 --- pkgs/development/python-modules/phonopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 0cdd9d8bff13..f0c443136adf 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.22.1"; + version = "2.23.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nux6/1z1xBr+4+fWrR/oOc+zVOI9j60p/SHHAPZ+hWI="; + hash = "sha256-xJohROJNAPdEITtM/VncAYL8ASkfgThKy8XXnqiS3hU="; }; nativeBuildInputs = [ From 9993a754075fa6d81ba9b1449669b0d7dd0a3cbb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 May 2024 07:24:00 +0000 Subject: [PATCH 007/111] python311Packages.queuelib: 1.6.2 -> 1.7.0 --- pkgs/development/python-modules/queuelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix index e9643b813d77..d2622ffbf5fb 100644 --- a/pkgs/development/python-modules/queuelib/default.nix +++ b/pkgs/development/python-modules/queuelib/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "queuelib"; - version = "1.6.2"; + version = "1.7.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "4b207267f2642a8699a1f806045c56eb7ad1a85a10c0e249884580d139c2fcd2"; + sha256 = "sha256-KFUWIJbPAjBRCJCzVDeeocD/GdEF0xR9NJ0kM7siKwg="; }; buildInputs = [ pytest ]; From 2278fc07477f87cf24aca8653d11b0f4638e482f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 May 2024 08:48:49 +0000 Subject: [PATCH 008/111] python311Packages.dvclive: 3.45.0 -> 3.46.0 --- pkgs/development/python-modules/dvclive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 7090433431a9..fd78c6ca873d 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "3.45.0"; + version = "3.46.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvclive"; rev = "refs/tags/${version}"; - hash = "sha256-76PjBPr3m1y5osW024dkhuvuXl2FiZ5oxlJ1Ucq8msI="; + hash = "sha256-yIViKlkCdoG2vSZdScL38fZd9musLRKzBd9wSR6lJdk="; }; build-system = [ From a3e4e8375fbd635d19122baf2b804584d27fc33e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 May 2024 09:39:04 +0000 Subject: [PATCH 009/111] python311Packages.google-cloud-bigquery-storage: 2.24.0 -> 2.25.0 --- .../python-modules/google-cloud-bigquery-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 1cda61e13757..a669bd364133 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.24.0"; + version = "2.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tK9bmqzYOWuEB9G4d2AaN22O6m0ZKCOop4gb0v3Ads4="; + hash = "sha256-GV/9KxgOnqoivqs+QKC2Hs0UbssyZnz0Immo1xEbTUg="; }; propagatedBuildInputs = [ From 120d66967510bb8d30fc7f0c94fdd7460dc7a5ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 May 2024 09:46:24 +0000 Subject: [PATCH 010/111] python311Packages.nethsm: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/nethsm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nethsm/default.nix b/pkgs/development/python-modules/nethsm/default.nix index 902fa62e3387..9120b29638fc 100644 --- a/pkgs/development/python-modules/nethsm/default.nix +++ b/pkgs/development/python-modules/nethsm/default.nix @@ -12,7 +12,7 @@ let pname = "nethsm"; - version = "1.0.0"; + version = "1.1.0"; in buildPythonPackage { @@ -21,7 +21,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-sENuSdA4pYt8v2w2RvDkcQLYCP9V0vZOdWOlkNBi3/o="; + hash = "sha256-CQhheHQ0BlfznKjoOSRvbDtnlTvv/SLtl0GWd7LUSt8="; }; propagatedBuildInputs = [ From 98ec215e95cda61bbca74f5b73b974cdc4c045e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 May 2024 14:14:24 +0000 Subject: [PATCH 011/111] python311Packages.aioconsole: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/aioconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 8cb67f32a920..0c5346eebd67 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -17,7 +17,7 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = "aioconsole"; rev = "refs/tags/v${version}"; - hash = "sha256-SKJLc1Tauwpmh2xtFFyHqKRaaQAK99SpbbGLFmAbKcQ="; + hash = "sha256-c8zeKebS04bZS9pMIKAauaLPvRrWaGoDKbnF906tFzQ="; }; nativeBuildInputs = [ From d1525013e27f3b1475ab29afa56668009103370b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 May 2024 17:11:46 +0000 Subject: [PATCH 012/111] python311Packages.dbt-bigquery: 1.7.7 -> 1.7.8 --- pkgs/development/python-modules/dbt-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbt-bigquery/default.nix b/pkgs/development/python-modules/dbt-bigquery/default.nix index d6401c6502a0..2ad6e8b1a42e 100644 --- a/pkgs/development/python-modules/dbt-bigquery/default.nix +++ b/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dbt-bigquery"; - version = "1.7.7"; + version = "1.7.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-bigquery"; rev = "refs/tags/v${version}"; - hash = "sha256-+UF49ReSxKQ8ouutOv1b9JcU/6CNk7Yw8f1/tlRvwnU="; + hash = "sha256-Uc842hkrCYDR92ACDtNW+Iqq5l54CSp40D1tOL7wt8o="; }; pythonRelaxDeps = [ From 81dcb7239caf415e3a6b28efb39dbbb5a93fee53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 May 2024 19:04:32 +0000 Subject: [PATCH 013/111] python311Packages.dash: 2.16.1 -> 2.17.0 --- pkgs/development/python-modules/dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 89601f3f482d..61fbeb9ae6b7 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.16.1"; + version = "2.17.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "plotly"; repo = "dash"; rev = "refs/tags/v${version}"; - hash = "sha256-IPyGQXrC2FTTSIC4IFGwKTceyzPYAe4jwDoO5C9YeF0="; + hash = "sha256-45nSQ3N7VcPsXthmMj3gMWFPi/i9z0peI1Wc6fUT7So="; }; nativeBuildInputs = [ From 340ded6fc4b64334dade8a9a053174b982c48ebd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 May 2024 19:10:18 +0000 Subject: [PATCH 014/111] python311Packages.aws-lambda-builders: 1.48.0 -> 1.49.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 9e32768ee18d..561942aa79ce 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.48.0"; + version = "1.49.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-g1f0OL41lvs8OLyLcBk6XJk9wZO/oWluUj5sUcXlUIE="; + hash = "sha256-14qG3AuIlQI6n2XouPfUx7LNZqR0gSnI4OlkiYS62jA="; }; postPatch = '' From 4863f58e758aba4a14b6a4de7e63a7916e714868 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 May 2024 21:31:12 +0000 Subject: [PATCH 015/111] python311Packages.pytado: 0.17.5 -> 0.17.6 --- pkgs/development/python-modules/pytado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index 8a9a3f4cf2fa..5d84a47702b0 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytado"; - version = "0.17.5"; + version = "0.17.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "wmalgadey"; repo = "PyTado"; rev = "refs/tags/${version}"; - hash = "sha256-FjdqZc4Zt2sLYJpnD/MAzr8Y9lGHteHB5psQqheS84I="; + hash = "sha256-KcYxUKQuO7TLS4YPg2mrBjP+DMnvZeJokGzwmeM/CvE="; }; nativeBuildInputs = [ From 3c2cdc96163cb2e67e594404277b1f77d4aa5e4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 May 2024 08:41:09 +0000 Subject: [PATCH 016/111] python311Packages.paste: 3.10.0 -> 3.10.1 --- pkgs/development/python-modules/paste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 47fb42209dec..8b6b3e9765ba 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "paste"; - version = "3.10.0"; + version = "3.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cdent"; repo = "paste"; rev = "refs/tags/${version}"; - hash = "sha256-gl0+mw0D0iGVmOc5jQP7b3EL1ZmT1lAr9ffx+XegdU0="; + hash = "sha256-NY/h6hbpluEu1XAv3o4mqoG+l0LXfM1dw7+G0Rm1E4o="; }; postPatch = '' From 280e2cf336dce53bcbcad71e201b2b5149782f2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 May 2024 19:18:34 +0000 Subject: [PATCH 017/111] python311Packages.trytond: 7.0.10 -> 7.2.1 --- pkgs/development/python-modules/trytond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 8660e95508ff..1a00120a80da 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.0.10"; + version = "7.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N/O27qQBD18lncW0hCfJkUlmCuej8HtV2x/MnRUDGcc="; + hash = "sha256-gIWWzm7emSwgKoO5geNIXUqKNsDiq6fle5OHb+KvhLE="; }; propagatedBuildInputs = [ From c33c0efc801b10b07a9d8b0ba026adbc0e0e1fd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 May 2024 19:45:57 +0000 Subject: [PATCH 018/111] python311Packages.pywbem: 1.7.1 -> 1.7.2 --- pkgs/development/python-modules/pywbem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index c298c1e51209..4f06262c59d2 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "pywbem"; - version = "1.7.1"; + version = "1.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6jx5H4FtM93JToXQwq9ihiPfMw7nX4KwFFQzHkAgnP4="; + hash = "sha256-3Dt4WEABf1/LY4HFZoJZjOu/yEUYUXaPheIxioTga2g="; }; propagatedBuildInputs = [ From 4787ce67c87df1c598c7b232875585fd909eb518 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 10:49:06 +0000 Subject: [PATCH 019/111] python311Packages.bdffont: 0.0.20 -> 0.0.24 --- pkgs/development/python-modules/bdffont/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bdffont/default.nix b/pkgs/development/python-modules/bdffont/default.nix index f5cd8f943121..29cbe658db4d 100644 --- a/pkgs/development/python-modules/bdffont/default.nix +++ b/pkgs/development/python-modules/bdffont/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "bdffont"; - version = "0.0.20"; + version = "0.0.24"; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-T0gTtudsZmL0VZ3a3+C/v+dWAwbXUgf0PEdNtkxWROw="; + hash = "sha256-3HJwtBV78zsMUlmwJrPj74Vd5cru1zflvies5mNGcy4="; }; format = "pyproject"; From 4ef084073ce400d92694016bc485f4ea414fe491 Mon Sep 17 00:00:00 2001 From: Malte Poll <1780588+malt3@users.noreply.github.com> Date: Tue, 7 May 2024 16:39:29 +0200 Subject: [PATCH 020/111] igvm-tooling: allow for determinist id block signing --- pkgs/by-name/ig/igvm-tooling/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ig/igvm-tooling/package.nix b/pkgs/by-name/ig/igvm-tooling/package.nix index b5fb283084b8..de9bdd996bf1 100644 --- a/pkgs/by-name/ig/igvm-tooling/package.nix +++ b/pkgs/by-name/ig/igvm-tooling/package.nix @@ -35,6 +35,14 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-hNfkclxaYViy66TPHqLV3mqD7wqBuBN9MnMLaDOeRNM="; stripLen = 1; }) + # allow for determinist id block signing + # remove once https://github.com/microsoft/igvm-tooling/pull/55 is merged + (fetchpatch { + name = "0003-add-deterministic-id-block-signature-mode.patch"; + url = "https://github.com/microsoft/igvm-tooling/commit/03ad7825ade76ac25e308bb85f92e89b732e0bf1.patch"; + sha256 = "sha256-Y7DFr0KgGtY8KOt6fLWd32sTaig/zHFe7n83+Yb9ls8="; + stripLen = 1; + }) ]; postPatch = '' From 0999991e93c21db12bdfee6191f36135ae384a72 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Tue, 7 May 2024 12:06:46 +0200 Subject: [PATCH 021/111] percona-server_8_3: init at 8.3.0-1 This release belongs to the "innovation" release track of Percona, making it likely to diverge over time from the LTS release. Hence I just created a separate packaging expression for this. --- nixos/tests/mysql/common.nix | 2 +- nixos/tests/mysql/mysql.nix | 3 +- pkgs/servers/sql/percona-server/8.3.nix | 112 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++ 4 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 pkgs/servers/sql/percona-server/8.3.nix diff --git a/nixos/tests/mysql/common.nix b/nixos/tests/mysql/common.nix index 1cf52347f4c7..2438164fe93c 100644 --- a/nixos/tests/mysql/common.nix +++ b/nixos/tests/mysql/common.nix @@ -4,7 +4,7 @@ inherit (pkgs) mysql80; }; perconaPackages = { - inherit (pkgs) percona-server_8_0; + inherit (pkgs) percona-server_8_0 percona-server_8_3; }; mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}"; } diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix index 0a61f9d38fe2..064c9ebedb01 100644 --- a/nixos/tests/mysql/mysql.nix +++ b/nixos/tests/mysql/mysql.nix @@ -146,6 +146,7 @@ in }) mariadbPackages) // (lib.mapAttrs (_: package: makeMySQLTest { inherit package; - name = "percona_8_0"; + # FIXME: packages are renamed soon anyways + #name = package.pname; hasMroonga = false; useSocketAuth = false; }) perconaPackages) diff --git a/pkgs/servers/sql/percona-server/8.3.nix b/pkgs/servers/sql/percona-server/8.3.nix new file mode 100644 index 000000000000..8bb9afb755e3 --- /dev/null +++ b/pkgs/servers/sql/percona-server/8.3.nix @@ -0,0 +1,112 @@ +{ lib, stdenv, fetchurl, bison, cmake, pkg-config +, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2 +, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests +, systemd +# Percona-specific deps +, coreutils, cyrus_sasl, gnumake, openldap +# optional: different malloc implementations +, withJemalloc ? false, withTcmalloc ? false, jemalloc, gperftools +}: + +assert !(withJemalloc && withTcmalloc); + + +stdenv.mkDerivation (finalAttrs: { + pname = "percona-server"; + version = "8.3.0-1"; + + src = fetchurl { + url = "https://downloads.percona.com/downloads/percona-distribution-mysql-ps/percona-distribution-mysql-ps-${builtins.head (lib.strings.split "-" finalAttrs.version)}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; + hash = "sha256-GeuifzqCkStmb4qYa8147XBHvMogYwfsn0FyHdO4WEg"; + }; + + nativeBuildInputs = [ bison cmake pkg-config ] + ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + + patches = [ + ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch + ]; + + ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. + postPatch = '' + substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool + substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool + # The rocksdb setup script is called with `env -i` and cannot find anything in PATH. + patchShebangs storage/rocksdb/get_rocksdb_files.sh + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE" + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --" + ''; + + buildInputs = [ + boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib + zstd libfido2 openldap perl cyrus_sasl + ] ++ lib.optionals stdenv.isLinux [ + numactl libtirpc systemd + ] ++ lib.optionals stdenv.isDarwin [ + cctools CoreServices developer_cmds DarwinTools + ] + ++ lib.optional (stdenv.isLinux && withJemalloc) jemalloc + ++ lib.optional (stdenv.isLinux && withTcmalloc) gperftools; + + outputs = [ "out" "static" ]; + + cmakeFlags = [ + # Percona-specific flags. + "-DPORTABLE=1" + "-DWITH_LDAP=system" + "-DROCKSDB_DISABLE_AVX2=1" + "-DROCKSDB_DISABLE_MARCH_NATIVE=1" + + # Flags taken from mysql package. + "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin. + "-DWITH_ROUTER=OFF" # It may be packaged separately. + "-DWITH_SYSTEM_LIBS=ON" + "-DWITH_UNIT_TESTS=OFF" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_MYSQLTESTDIR=" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + + + ] ++ lib.optionals stdenv.isLinux [ + "-DWITH_SYSTEMD=1" + "-DWITH_SYSTEMD_DEBUG=1" + ] + ++ lib.optional (stdenv.isLinux && withJemalloc) "-DWITH_JEMALLOC=1" + ++ lib.optional (stdenv.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1"; + + postInstall = '' + moveToOutput "lib/*.a" $static + so=${stdenv.hostPlatform.extensions.sharedLibrary} + ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so + ''; + + passthru = { + client = finalAttrs.finalPackage; + connector-c = finalAttrs.finalPackage; + server = finalAttrs.finalPackage; + mysqlVersion = lib.versions.majorMinor finalAttrs.version; + tests = nixosTests.mysql.percona-server_8_3; + }; + + + meta = with lib; { + homepage = "https://www.percona.com/software/mysql-database/percona-server"; + description = '' + A free, fully compatible, enhanced, open source drop-in replacement for + MySQL® that provides superior performance, scalability and instrumentation. + ''; + license = licenses.gpl2; + maintainers = teams.flyingcircus.members; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c526f939d01d..ca39787f4446 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11708,6 +11708,12 @@ with pkgs; icu = icu69; protobuf = protobuf_21; }; + percona-server_8_3 = callPackage ../servers/sql/percona-server/8.3.nix { + inherit (darwin) cctools developer_cmds DarwinTools; + inherit (darwin.apple_sdk.frameworks) CoreServices; + # newer versions cause linking failures against `libabsl_spinlock_wait` + protobuf = protobuf_21; + }; percona-xtrabackup = percona-xtrabackup_8_0; percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { boost = boost177; From 031f89ddf3b207646a54fca83ad38bc5e62a890d Mon Sep 17 00:00:00 2001 From: RmiTtro Date: Wed, 1 May 2024 21:13:21 -0400 Subject: [PATCH 022/111] python3Packages.pipetools: init at 1.1.0 --- .../python-modules/pipetools/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/pipetools/default.nix diff --git a/pkgs/development/python-modules/pipetools/default.nix b/pkgs/development/python-modules/pipetools/default.nix new file mode 100644 index 000000000000..9003f61b28e8 --- /dev/null +++ b/pkgs/development/python-modules/pipetools/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "pipetools"; + version = "1.1.0"; + + # Used github as the src since the pypi package does not include the tests + src = fetchFromGitHub { + owner = "0101"; + repo = pname; + rev = "6cba9fadab07a16fd85eed16d5cffc609f84c62b"; + hash = "sha256-BoZFePQCQfz1dkct5p/WQLuXoNX3eLcnKf3Mf0fG6u8="; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + propagatedBuildInputs = [ setuptools ]; + + pythonImportsCheck = [ "pipetools" ]; + + meta = { + description = "A library that enables function composition similar to using Unix pipes"; + homepage = "https://0101.github.io/pipetools/"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 36783fd443f8..a65edcb9d479 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9646,6 +9646,8 @@ self: super: with self; { pins = callPackage ../development/python-modules/pins { }; + pipetools = callPackage ../development/python-modules/pipetools { }; + pg8000 = callPackage ../development/python-modules/pg8000 { }; pgcli = callPackage ../development/python-modules/pgcli { }; From 58240f80691a086abe911d9e9781f51c3a356acd Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Tue, 7 May 2024 19:58:27 +0200 Subject: [PATCH 023/111] percona-xtrabackup_8_3: init at 8.3.0-1 This is likely to diverge from the LTS xtrabackup packaging over time. But as this package was already structured in a modular way, let's keep the generic builder as long as it's feasible. --- pkgs/tools/backup/percona-xtrabackup/8_3.nix | 15 +++++++++++++++ pkgs/tools/backup/percona-xtrabackup/generic.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/backup/percona-xtrabackup/8_3.nix diff --git a/pkgs/tools/backup/percona-xtrabackup/8_3.nix b/pkgs/tools/backup/percona-xtrabackup/8_3.nix new file mode 100644 index 000000000000..003df8aa6b50 --- /dev/null +++ b/pkgs/tools/backup/percona-xtrabackup/8_3.nix @@ -0,0 +1,15 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "8.3.0-1"; + hash = "sha256-qZM2AFhpwrN0BR+DdozYn7s2I+c1tWpD5QvppTEfGEY="; + + # includes https://github.com/Percona-Lab/libkmip.git + fetchSubmodules = true; + + extraPatches = [ + ]; + + extraPostInstall = '' + ''; +}) diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index 112a3f556204..6a6906cba33c 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -5,14 +5,14 @@ , version, hash, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "percona-xtrabackup"; inherit version; src = fetchFromGitHub { owner = "percona"; repo = "percona-xtrabackup"; - rev = "${pname}-${version}"; + rev = "${finalAttrs.pname}-${finalAttrs.version}"; inherit hash fetchSubmodules; }; @@ -47,6 +47,8 @@ stdenv.mkDerivation rec { rm -r "$out"/lib/plugin/debug '' + extraPostInstall; + passthru.mysqlVersion = lib.versions.majorMinor finalAttrs.version; + meta = with lib; { description = "Non-blocking backup tool for MySQL"; homepage = "http://www.percona.com/software/percona-xtrabackup"; @@ -54,4 +56,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = teams.flyingcircus.members ++ [ maintainers.izorkin ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca39787f4446..8da8cde63605 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11718,6 +11718,7 @@ with pkgs; percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { boost = boost177; }; + percona-xtrabackup_8_3 = callPackage ../tools/backup/percona-xtrabackup/8_3.nix { }; pick = callPackage ../tools/misc/pick { }; From 52506a2744f3a1a6dce813a1cdc8ac85fc1db5f9 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Tue, 7 May 2024 21:01:30 +0200 Subject: [PATCH 024/111] percona: adapt upstream release model In accordance to the upstream release cycle, we now provide 2 flavours of the percona mysql ecosystem. The default is the LTS variant, additionally there is now the floating `percona-server_innovation` always pointing to the most recent regular release. - mentioned in release notes - adapted all depending tests and tools (xtrabackup) --- nixos/doc/manual/release-notes/rl-2405.section.md | 4 ++++ nixos/tests/mysql/common.nix | 2 +- nixos/tests/mysql/mysql.nix | 3 +-- .../sql/percona-server/{8.3.nix => innovation.nix} | 4 ++-- .../servers/sql/percona-server/{8.0.x.nix => lts.nix} | 4 ++-- .../percona-xtrabackup/{8_3.nix => innovation.nix} | 0 .../backup/percona-xtrabackup/{8_0.nix => lts.nix} | 0 pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 11 ++++++----- 9 files changed, 18 insertions(+), 12 deletions(-) rename pkgs/servers/sql/percona-server/{8.3.nix => innovation.nix} (97%) rename pkgs/servers/sql/percona-server/{8.0.x.nix => lts.nix} (97%) rename pkgs/tools/backup/percona-xtrabackup/{8_3.nix => innovation.nix} (100%) rename pkgs/tools/backup/percona-xtrabackup/{8_0.nix => lts.nix} (100%) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index e545bda2fba3..430379242497 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -238,6 +238,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `unrar` was updated to v7. See [changelog](https://www.rarlab.com/unrar7notes.htm) for more information. +- `percona-server` now follows [the same two-fold release cycle](https://www.percona.com/blog/lts-and-innovation-releases-for-percona-server-for-mysql/) as Oracle MySQL and provides a *Long-Term-Support (LTS)* in parallel with a continuous-delivery *Innovation* release. `percona-server` defaults to `percona-server_lts`, will be backed by the same release branch throughout the lifetime of this stable NixOS release, and is still available under the versioned attribute `percona-server_8_0`. + The `percona-server_innovation` releases however have support periods shorter than the lifetime of this NixOS release and will continuously be updated to newer Percona releases. Note that Oracle considers the *Innovation* releases to be production-grade, but each release might include backwards-incompatible changes, even in its on-disk format. + The same release scheme is applied to the supporting `percona-xtrabackup` tool as well. + - `git-town` was updated from version 11 to 13. See the [changelog](https://github.com/git-town/git-town/blob/main/CHANGELOG.md#1300-2024-03-22) for breaking changes. - `k9s` was updated to v0.31. There have been various breaking changes in the config file format, diff --git a/nixos/tests/mysql/common.nix b/nixos/tests/mysql/common.nix index 2438164fe93c..ad54b0e00c1b 100644 --- a/nixos/tests/mysql/common.nix +++ b/nixos/tests/mysql/common.nix @@ -4,7 +4,7 @@ inherit (pkgs) mysql80; }; perconaPackages = { - inherit (pkgs) percona-server_8_0 percona-server_8_3; + inherit (pkgs) percona-server_lts percona-server_innovation; }; mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}"; } diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix index 064c9ebedb01..093da4f46aa1 100644 --- a/nixos/tests/mysql/mysql.nix +++ b/nixos/tests/mysql/mysql.nix @@ -146,7 +146,6 @@ in }) mariadbPackages) // (lib.mapAttrs (_: package: makeMySQLTest { inherit package; - # FIXME: packages are renamed soon anyways - #name = package.pname; + name = builtins.replaceStrings ["-"] ["_"] package.pname; hasMroonga = false; useSocketAuth = false; }) perconaPackages) diff --git a/pkgs/servers/sql/percona-server/8.3.nix b/pkgs/servers/sql/percona-server/innovation.nix similarity index 97% rename from pkgs/servers/sql/percona-server/8.3.nix rename to pkgs/servers/sql/percona-server/innovation.nix index 8bb9afb755e3..d19c17554226 100644 --- a/pkgs/servers/sql/percona-server/8.3.nix +++ b/pkgs/servers/sql/percona-server/innovation.nix @@ -12,7 +12,7 @@ assert !(withJemalloc && withTcmalloc); stdenv.mkDerivation (finalAttrs: { - pname = "percona-server"; + pname = "percona-server_innovation"; version = "8.3.0-1"; src = fetchurl { @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { connector-c = finalAttrs.finalPackage; server = finalAttrs.finalPackage; mysqlVersion = lib.versions.majorMinor finalAttrs.version; - tests = nixosTests.mysql.percona-server_8_3; + tests = nixosTests.mysql.percona-server_innovation; }; diff --git a/pkgs/servers/sql/percona-server/8.0.x.nix b/pkgs/servers/sql/percona-server/lts.nix similarity index 97% rename from pkgs/servers/sql/percona-server/8.0.x.nix rename to pkgs/servers/sql/percona-server/lts.nix index a2f4dd1c04e0..f8b13aa4180a 100644 --- a/pkgs/servers/sql/percona-server/8.0.x.nix +++ b/pkgs/servers/sql/percona-server/lts.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "percona-server"; + pname = "percona-server_lts"; version = "8.0.36-28"; src = fetchurl { @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { connector-c = finalAttrs.finalPackage; server = finalAttrs.finalPackage; mysqlVersion = lib.versions.majorMinor finalAttrs.version; - tests = nixosTests.mysql.percona-server_8_0; + tests = nixosTests.mysql.percona-server_lts; }; meta = with lib; { diff --git a/pkgs/tools/backup/percona-xtrabackup/8_3.nix b/pkgs/tools/backup/percona-xtrabackup/innovation.nix similarity index 100% rename from pkgs/tools/backup/percona-xtrabackup/8_3.nix rename to pkgs/tools/backup/percona-xtrabackup/innovation.nix diff --git a/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/pkgs/tools/backup/percona-xtrabackup/lts.nix similarity index 100% rename from pkgs/tools/backup/percona-xtrabackup/8_0.nix rename to pkgs/tools/backup/percona-xtrabackup/lts.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f3fa9f35b9e6..c12e96189539 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -960,6 +960,8 @@ mapAliases ({ pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 peach = asouldocs; # Added 2022-08-28 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 + percona-server_8_0 = percona-server_lts; # Added 2024-05-07 + percona-xtrabackup_8_0 = percona-xtrabackup_lts; # Added 2024-05-07 perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; perldevelPackages = perldevel; pgadmin = pgadmin4; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8da8cde63605..06870578e7fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11701,24 +11701,25 @@ with pkgs; perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; - percona-server_8_0 = callPackage ../servers/sql/percona-server/8.0.x.nix { + percona-server = percona-server_lts; + percona-server_lts = callPackage ../servers/sql/percona-server/lts.nix { inherit (darwin) cctools developer_cmds DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost177; # Configure checks for specific version. icu = icu69; protobuf = protobuf_21; }; - percona-server_8_3 = callPackage ../servers/sql/percona-server/8.3.nix { + percona-server_innovation = callPackage ../servers/sql/percona-server/innovation.nix { inherit (darwin) cctools developer_cmds DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; # newer versions cause linking failures against `libabsl_spinlock_wait` protobuf = protobuf_21; }; - percona-xtrabackup = percona-xtrabackup_8_0; - percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { + percona-xtrabackup = percona-xtrabackup_lts; + percona-xtrabackup_lts = callPackage ../tools/backup/percona-xtrabackup/lts.nix { boost = boost177; }; - percona-xtrabackup_8_3 = callPackage ../tools/backup/percona-xtrabackup/8_3.nix { }; + percona-xtrabackup_innovation = callPackage ../tools/backup/percona-xtrabackup/innovation.nix { }; pick = callPackage ../tools/misc/pick { }; From 9164c33ab66913fd394f008408d323bbff741856 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Wed, 8 May 2024 00:35:00 +0200 Subject: [PATCH 025/111] percona: apply required multi-version package structure To work around the pkgs/by-name CI check, I applied the recommended structure refactoring as documented in https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name#further-possible-refactorings --- pkgs/servers/sql/percona-server/default.nix | 15 +++++++++++++++ .../backup/percona-xtrabackup/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 19 ++----------------- 3 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 pkgs/servers/sql/percona-server/default.nix create mode 100644 pkgs/tools/backup/percona-xtrabackup/default.nix diff --git a/pkgs/servers/sql/percona-server/default.nix b/pkgs/servers/sql/percona-server/default.nix new file mode 100644 index 000000000000..8cab6ec656a2 --- /dev/null +++ b/pkgs/servers/sql/percona-server/default.nix @@ -0,0 +1,15 @@ +pkgs: { + percona-server_lts = pkgs.callPackage ./lts.nix { + inherit (pkgs.darwin) cctools developer_cmds DarwinTools; + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + boost = pkgs.boost177; # Configure checks for specific version. + icu = pkgs.icu69; + protobuf = pkgs.protobuf_21; + }; + percona-server_innovation = pkgs.callPackage ./innovation.nix { + inherit (pkgs.darwin) cctools developer_cmds DarwinTools; + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + # newer versions cause linking failures against `libabsl_spinlock_wait` + protobuf = pkgs.protobuf_21; + }; +} diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix new file mode 100644 index 000000000000..f3466dc9f165 --- /dev/null +++ b/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -0,0 +1,6 @@ +pkgs: { + percona-xtrabackup_lts = pkgs.callPackage ./lts.nix { + boost = pkgs.boost177; + }; + percona-xtrabackup_innovation = pkgs.callPackage ./innovation.nix { }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06870578e7fb..f42508513ec5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11701,25 +11701,10 @@ with pkgs; perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; + inherit (import ../servers/sql/percona-server pkgs) percona-server_lts percona-server_innovation; percona-server = percona-server_lts; - percona-server_lts = callPackage ../servers/sql/percona-server/lts.nix { - inherit (darwin) cctools developer_cmds DarwinTools; - inherit (darwin.apple_sdk.frameworks) CoreServices; - boost = boost177; # Configure checks for specific version. - icu = icu69; - protobuf = protobuf_21; - }; - percona-server_innovation = callPackage ../servers/sql/percona-server/innovation.nix { - inherit (darwin) cctools developer_cmds DarwinTools; - inherit (darwin.apple_sdk.frameworks) CoreServices; - # newer versions cause linking failures against `libabsl_spinlock_wait` - protobuf = protobuf_21; - }; + inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_lts percona-xtrabackup_innovation; percona-xtrabackup = percona-xtrabackup_lts; - percona-xtrabackup_lts = callPackage ../tools/backup/percona-xtrabackup/lts.nix { - boost = boost177; - }; - percona-xtrabackup_innovation = callPackage ../tools/backup/percona-xtrabackup/innovation.nix { }; pick = callPackage ../tools/misc/pick { }; From 1f8b4c897bccaff97d20bfef76c6ddd101c36186 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 10:40:38 +0000 Subject: [PATCH 026/111] ironicclient: 5.5.0 -> 5.6.0 --- .../python-modules/python-ironicclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index 7e9a3b4ee7c2..feb8849b21d3 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "python-ironicclient"; - version = "5.5.0"; + version = "5.6.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-JlO487QSPsBJZqPYRhsQYFA7noIN2q/stH4eZXAFLnY="; + hash = "sha256-zWlfy+Pfu0l7vBQnLOIP9vaXzx+i35k4oQqPUtLg3cE="; }; propagatedBuildInputs = [ From 9630d00c18f20c2d75ed33c24ac2690e2f693cb0 Mon Sep 17 00:00:00 2001 From: Nanotwerp Date: Wed, 8 May 2024 09:43:36 -0400 Subject: [PATCH 027/111] nixos/virt-manager: use dconf to autoconnect QEMU/KVM --- nixos/modules/programs/virt-manager.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/nixos/modules/programs/virt-manager.nix b/nixos/modules/programs/virt-manager.nix index 095db7586a03..9b5fa22268ae 100644 --- a/nixos/modules/programs/virt-manager.nix +++ b/nixos/modules/programs/virt-manager.nix @@ -2,15 +2,27 @@ let cfg = config.programs.virt-manager; -in { +in +{ options.programs.virt-manager = { enable = lib.mkEnableOption "virt-manager, an UI for managing virtual machines in libvirt"; - package = lib.mkPackageOption pkgs "virt-manager" {}; + package = lib.mkPackageOption pkgs "virt-manager" { }; }; config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - programs.dconf.enable = true; + programs.dconf = { + profiles.user.databases = [ + { + settings = { + "org/virt-manager/virt-manager/connections" = { + autoconnect = [ "qemu:///system" ]; + uris = [ "qemu:///system" ]; + }; + }; + } + ]; + }; }; } From 8a2c1e2ba19122c8ea0fc730b512336ed31f1fc7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 00:27:16 +0000 Subject: [PATCH 028/111] python311Packages.dtlssocket: 0.1.16 -> 0.1.18 --- pkgs/development/python-modules/dtlssocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dtlssocket/default.nix b/pkgs/development/python-modules/dtlssocket/default.nix index bad1a6c73377..16b60266c6a7 100644 --- a/pkgs/development/python-modules/dtlssocket/default.nix +++ b/pkgs/development/python-modules/dtlssocket/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "dtlssocket"; - version = "0.1.16"; + version = "0.1.18"; format = "pyproject"; src = fetchPypi { pname = "DTLSSocket"; inherit version; - hash = "sha256-MLEIrkX84cAz4+9sLd1+dBgGKuN0Io46f6lpslQ2ajk="; + hash = "sha256-TnS2LYe6CeAlezc83bGpRqOpQbPJMQHzJn6PnXon4FI="; }; nativeBuildInputs = [ From 64b4d9dec9b5a788a7728449a2d220957f1f8b4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 20:28:56 +0000 Subject: [PATCH 029/111] rwpspread: 0.2.6 -> 0.3.0 --- pkgs/by-name/rw/rwpspread/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rw/rwpspread/package.nix b/pkgs/by-name/rw/rwpspread/package.nix index 23df67be87c9..954bdd4092d1 100644 --- a/pkgs/by-name/rw/rwpspread/package.nix +++ b/pkgs/by-name/rw/rwpspread/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage rec { pname = "rwpspread"; - version = "0.2.6"; + version = "0.3.0"; src = fetchFromGitHub { owner = "0xk1f0"; repo = "rwpspread"; rev = "v${version}"; - hash = "sha256-6pYMKBm3f0kH+KD6yWy7/H/bg8v7hNm81KAKHp02HY8="; + hash = "sha256-B8K8/M5cUSchG54ar0ZY2XOH6lYLimdZr+dk5ffdplY="; }; - cargoHash = "sha256-/SjSwjrqODx9imtVxmOCrG4KwhXymHokyQ8FSC1SOd8="; + cargoHash = "sha256-bTCXgaE8+nxuEFeOMSihL3lfmbIxiv1f400rmyV2b8k="; nativeBuildInputs = [ pkg-config ]; From 31f659482fec9a796035d18a82c79bbd7441fdae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 20:38:48 +0000 Subject: [PATCH 030/111] python311Packages.google-cloud-dlp: 3.16.0 -> 3.17.0 --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index f3895b8e3ef1..52c1ee3e4f2d 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.16.0"; + version = "3.17.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DWmh96XviHVsmeVrivTDnq5A0hBog/DieUxcs2QmltU="; + hash = "sha256-YMUEBj8c154KA5Y/cm1gbypDxkfY4ncCq5wbym5rS9s="; }; nativeBuildInputs = [ From 4919275d5157c83d2208d5b26620bbf63669612c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 May 2024 22:18:43 +0000 Subject: [PATCH 031/111] python311Packages.stripe: 9.5.0 -> 9.6.0 --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index f13eef796b6f..9017a5b7a6ff 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "9.5.0"; + version = "9.6.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-zTg2lkGuYUDhzp7c1UAK7NsaELpwTmU6Lyp1UMuPJ34="; + hash = "sha256-kwXYSc6nFdxZxeOdAYkUdbguEO252V7h2BiUV+XeeS8="; }; nativeBuildInputs = [ From 94b6d81e72bb8a9de07e8e9d458c9f73abcb1e9b Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 10 May 2024 18:19:42 -0400 Subject: [PATCH 032/111] vesktop: don't use system vencord by default --- pkgs/by-name/ve/vesktop/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 8b06a570dedc..822f1b60d1b8 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -19,7 +19,7 @@ , withTTS ? true # Enables the use of vencord from nixpkgs instead of # letting vesktop manage it's own version -, withSystemVencord ? true +, withSystemVencord ? false }: stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; From 4d07bdc03028089f152ebc900dd80a722d450f98 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 10 May 2024 18:27:14 -0400 Subject: [PATCH 033/111] vesktop: refactor --- pkgs/by-name/ve/vesktop/package.nix | 65 +++++++++++++++++------------ 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 822f1b60d1b8..2f2983d5071e 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -41,55 +41,57 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) src version patches ELECTRON_SKIP_BINARY_DOWNLOAD; nativeBuildInputs = [ + cacert jq moreutils nodePackages.pnpm - cacert ]; - pnpmPatch = builtins.toJSON { - pnpm.supportedArchitectures = { - os = [ "linux" ]; - cpu = [ "x64" "arm64" ]; - }; - }; + # inspired by https://github.com/NixOS/nixpkgs/blob/763e59ffedb5c25774387bf99bc725df5df82d10/pkgs/applications/misc/pot/default.nix#L56 + # and based on https://github.com/NixOS/nixpkgs/pull/290715 + installPhase = '' + runHook preInstall + + export HOME=$(mktemp -d) + pnpm config set store-dir $out + # Some packages produce platform dependent outputs. We do not want to cache those in the global store + pnpm config set side-effects-cache false + # pnpm is going to warn us about using --force + # --force allows us to fetch all dependencies including ones that aren't meant for our host platform + pnpm install --force --frozen-lockfile --ignore-script - postPatch = '' - mv package.json package.json.orig - jq --raw-output ". * $pnpmPatch" package.json.orig > package.json ''; - # https://github.com/NixOS/nixpkgs/blob/763e59ffedb5c25774387bf99bc725df5df82d10/pkgs/applications/misc/pot/default.nix#L56 - installPhase = '' - export HOME=$(mktemp -d) - - pnpm config set store-dir $out - pnpm install --frozen-lockfile --ignore-script + fixupPhase = '' + runHook preFixup + # Remove timestamp and sort the json files rm -rf $out/v3/tmp for f in $(find $out -name "*.json"); do sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f jq --sort-keys . $f | sponge $f done + + runHook postFixup ''; + dontConfigure = true; dontBuild = true; - dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-6ezEBeYmK5va3gCh00YnJzZ77V/Ql7A3l/+csohkz68="; + outputHash = "sha256-PogE8uf3W5cKSCqFHMz7FOvT7ONUP4FiFWGBgtk3UC8="; }; nativeBuildInputs = [ + autoPatchelfHook copyDesktopItems + makeWrapper nodePackages.pnpm nodePackages.nodejs - makeWrapper - autoPatchelfHook ]; buildInputs = [ - pipewire libpulseaudio + pipewire stdenv.cc.cc.lib ]; @@ -99,7 +101,9 @@ stdenv.mkDerivation (finalAttrs: { ELECTRON_SKIP_BINARY_DOWNLOAD = 1; - preBuild = '' + configurePhase = '' + runHook preConfigure + export HOME=$(mktemp -d) export STORE_PATH=$(mktemp -d) @@ -107,11 +111,15 @@ stdenv.mkDerivation (finalAttrs: { chmod -R +w "$STORE_PATH" pnpm config set store-dir "$STORE_PATH" - pnpm install --offline --frozen-lockfile --ignore-script + pnpm install --frozen-lockfile --ignore-script --offline patchShebangs node_modules/{*,.*} + + runHook postConfigure ''; - postBuild = '' + buildPhase = '' + runHook preBuild + pnpm build # using `pnpm exec` here apparently makes it ignore ELECTRON_SKIP_BINARY_DOWNLOAD ./node_modules/.bin/electron-builder \ @@ -119,6 +127,8 @@ stdenv.mkDerivation (finalAttrs: { -c.asarUnpack="**/*.node" \ -c.electronDist=${electron}/libexec/electron \ -c.electronVersion=${electron.version} + + runHook postBuild ''; # this is consistent with other nixpkgs electron packages and upstream, as far as I am aware @@ -161,11 +171,12 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pnpmDeps; }; - meta = with lib; { + meta = { description = "An alternate client for Discord with Vencord built-in"; homepage = "https://github.com/Vencord/Vesktop"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ getchoo Scrumplex vgskye pluiedev ]; + changelog = "https://github.com/Vencord/Vesktop/releases/tag/${finalAttrs.src.rev}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ getchoo Scrumplex vgskye pluiedev ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "vesktop"; }; From 2aa16f19beda7d078db3afdc41a30b001b54d0cf Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 10 May 2024 18:35:03 -0400 Subject: [PATCH 034/111] vesktop: reformat --- pkgs/by-name/ve/vesktop/package.nix | 115 +++++++++++++++++----------- 1 file changed, 70 insertions(+), 45 deletions(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 2f2983d5071e..9e45802d392e 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -1,25 +1,26 @@ -{ lib -, stdenv -, stdenvNoCC -, fetchFromGitHub -, substituteAll -, makeWrapper -, makeDesktopItem -, copyDesktopItems -, vencord -, electron -, libicns -, jq -, moreutils -, cacert -, nodePackages -, pipewire -, libpulseaudio -, autoPatchelfHook -, withTTS ? true +{ + lib, + stdenv, + stdenvNoCC, + fetchFromGitHub, + substituteAll, + makeWrapper, + makeDesktopItem, + copyDesktopItems, + vencord, + electron, + libicns, + jq, + moreutils, + cacert, + nodePackages, + pipewire, + libpulseaudio, + autoPatchelfHook, + withTTS ? true, # Enables the use of vencord from nixpkgs instead of # letting vesktop manage it's own version -, withSystemVencord ? false + withSystemVencord ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; @@ -38,7 +39,12 @@ stdenv.mkDerivation (finalAttrs: { assert lib.versionAtLeast nodePackages.pnpm.version "8.10.0"; stdenvNoCC.mkDerivation { pname = "${finalAttrs.pname}-pnpm-deps"; - inherit (finalAttrs) src version patches ELECTRON_SKIP_BINARY_DOWNLOAD; + inherit (finalAttrs) + src + version + patches + ELECTRON_SKIP_BINARY_DOWNLOAD + ; nativeBuildInputs = [ cacert @@ -95,9 +101,12 @@ stdenv.mkDerivation (finalAttrs: { stdenv.cc.cc.lib ]; - patches = [ - ./disable_update_checking.patch - ] ++ lib.optional withSystemVencord (substituteAll { inherit vencord; src = ./use_system_vencord.patch; }); + patches = + [ ./disable_update_checking.patch ] + ++ lib.optional withSystemVencord (substituteAll { + inherit vencord; + src = ./use_system_vencord.patch; + }); ELECTRON_SKIP_BINARY_DOWNLOAD = 1; @@ -132,27 +141,26 @@ stdenv.mkDerivation (finalAttrs: { ''; # this is consistent with other nixpkgs electron packages and upstream, as far as I am aware - installPhase = - '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir -p $out/opt/Vesktop - cp -r dist/linux-*unpacked/resources $out/opt/Vesktop/ + mkdir -p $out/opt/Vesktop + cp -r dist/linux-*unpacked/resources $out/opt/Vesktop/ - pushd build - ${libicns}/bin/icns2png -x icon.icns - for file in icon_*x32.png; do - file_suffix=''${file//icon_} - install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vesktop.png - done + pushd build + ${libicns}/bin/icns2png -x icon.icns + for file in icon_*x32.png; do + file_suffix=''${file//icon_} + install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vesktop.png + done - makeWrapper ${electron}/bin/electron $out/bin/vesktop \ - --add-flags $out/opt/Vesktop/resources/app.asar \ - ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + makeWrapper ${electron}/bin/electron $out/bin/vesktop \ + --add-flags $out/opt/Vesktop/resources/app.asar \ + ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" - runHook postInstall - ''; + runHook postInstall + ''; desktopItems = [ (makeDesktopItem { @@ -162,8 +170,17 @@ stdenv.mkDerivation (finalAttrs: { icon = "vesktop"; startupWMClass = "Vesktop"; genericName = "Internet Messenger"; - keywords = [ "discord" "vencord" "electron" "chat" ]; - categories = [ "Network" "InstantMessaging" "Chat" ]; + keywords = [ + "discord" + "vencord" + "electron" + "chat" + ]; + categories = [ + "Network" + "InstantMessaging" + "Chat" + ]; }) ]; @@ -176,8 +193,16 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Vencord/Vesktop"; changelog = "https://github.com/Vencord/Vesktop/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ getchoo Scrumplex vgskye pluiedev ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with lib.maintainers; [ + getchoo + Scrumplex + vgskye + pluiedev + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; mainProgram = "vesktop"; }; }) From 844c1dcf92e3f2cc620bc9983008d91b92cd65c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 May 2024 10:17:21 +0200 Subject: [PATCH 035/111] python312Packages.pyrainbird: refactor --- pkgs/development/python-modules/pyrainbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index bca013babd9e..654c73b227b9 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -40,11 +40,11 @@ buildPythonPackage rec { --replace-fail "--cov=pyrainbird --cov-report=term-missing" "" ''; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp-retry ical pycryptodome From c019fcde714510cc14d196dda96b411ee84ede85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 May 2024 10:18:55 +0200 Subject: [PATCH 036/111] python312Packages.pyrainbird: 4.0.2 -> 5.0.0 Diff: https://github.com/allenporter/pyrainbird/compare/refs/tags/4.0.2...5.0.0 Changelog: https://github.com/allenporter/pyrainbird/releases/tag/5.0.0 --- pkgs/development/python-modules/pyrainbird/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 654c73b227b9..a84f8ebe5cec 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -4,9 +4,9 @@ , fetchFromGitHub , freezegun , ical +, mashumaro , parameterized , pycryptodome -, pydantic , pytest-aiohttp , pytest-asyncio , pytest-golden @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "4.0.2"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "pyrainbird"; rev = "refs/tags/${version}"; - hash = "sha256-4AoxLZv0u8wCG3ihw0JqsqsO5zG5UyP4ebSX99ve8sg="; + hash = "sha256-72FmcZOCe90Yt/Osa5YALMbdZwxwNgTbpXSmvJdkC8Q="; }; postPatch = '' @@ -47,8 +47,8 @@ buildPythonPackage rec { dependencies = [ aiohttp-retry ical + mashumaro pycryptodome - pydantic python-dateutil pyyaml requests From fa030ff6a54162ea131516c1907ee0b28d1d58d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 May 2024 10:19:09 +0200 Subject: [PATCH 037/111] python312Packages.pyrainbird: format with nixfmt --- .../python-modules/pyrainbird/default.nix | 51 +++++++++---------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index a84f8ebe5cec..4f98e9436aaf 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -1,24 +1,25 @@ -{ lib -, aiohttp-retry -, buildPythonPackage -, fetchFromGitHub -, freezegun -, ical -, mashumaro -, parameterized -, pycryptodome -, pytest-aiohttp -, pytest-asyncio -, pytest-golden -, pytest-mock -, pytestCheckHook -, python-dateutil -, pythonOlder -, pyyaml -, requests -, requests-mock -, responses -, setuptools +{ + lib, + aiohttp-retry, + buildPythonPackage, + fetchFromGitHub, + freezegun, + ical, + mashumaro, + parameterized, + pycryptodome, + pytest-aiohttp, + pytest-asyncio, + pytest-golden, + pytest-mock, + pytestCheckHook, + python-dateutil, + pythonOlder, + pyyaml, + requests, + requests-mock, + responses, + setuptools, }: buildPythonPackage rec { @@ -40,9 +41,7 @@ buildPythonPackage rec { --replace-fail "--cov=pyrainbird --cov-report=term-missing" "" ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp-retry @@ -68,9 +67,7 @@ buildPythonPackage rec { responses ]; - pythonImportsCheck = [ - "pyrainbird" - ]; + pythonImportsCheck = [ "pyrainbird" ]; meta = with lib; { description = "Module to interact with Rainbird controllers"; From 9cfdf95d276eafe719bed8c277aa48044ae21656 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 May 2024 22:53:24 +0200 Subject: [PATCH 038/111] python311Packages.pyrainbird: 5.0.0 -> 6.0.1 Diff: https://github.com/allenporter/pyrainbird/compare/refs/tags/5.0.0...6.0.1 Changelog: https://github.com/allenporter/pyrainbird/releases/tag/6.0.1 --- pkgs/development/python-modules/pyrainbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 4f98e9436aaf..131cf9f551de 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "5.0.0"; + version = "6.0.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "pyrainbird"; rev = "refs/tags/${version}"; - hash = "sha256-72FmcZOCe90Yt/Osa5YALMbdZwxwNgTbpXSmvJdkC8Q="; + hash = "sha256-kRPRyEt31SJpNRXcTshGByKAfPzEj+CDNpEQp4Klgks="; }; postPatch = '' From 8066db1e3c6744a874d766a912769e4630c038a7 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 12 May 2024 12:55:39 +0200 Subject: [PATCH 039/111] npins: 0.2.2 -> 0.2.4 --- pkgs/tools/nix/npins/default.nix | 2 +- pkgs/tools/nix/npins/sources.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/nix/npins/default.nix b/pkgs/tools/nix/npins/default.nix index 02ec39094ddf..9d10464aa73c 100644 --- a/pkgs/tools/nix/npins/default.nix +++ b/pkgs/tools/nix/npins/default.nix @@ -19,7 +19,7 @@ in rustPlatform.buildRustPackage rec { version = src.version; src = passthru.mkSource sources.npins; - cargoSha256 = "sha256-eySVpmCVWBJfyAkTQv+LqojWMO/3r6kBYP1a4z+FYHY="; + cargoSha256 = "sha256-YwMypBl+P1ygf4zUbkZlq4zPrOzf+lPOz2FLg2/xI3k="; buildInputs = lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/nix/npins/sources.json b/pkgs/tools/nix/npins/sources.json index fbeb040fa74c..f7faf4210d72 100644 --- a/pkgs/tools/nix/npins/sources.json +++ b/pkgs/tools/nix/npins/sources.json @@ -9,10 +9,10 @@ }, "pre_releases": false, "version_upper_bound": null, - "version": "0.2.2", - "revision": "a443c58d9c7b818aaea3c47821d7c561faef66ec", - "url": "https://api.github.com/repos/andir/npins/tarball/0.2.2", - "hash": "0rv6m8c9lmzkb76b682w7ax6jy8ls4l4y17wjx98jk64b74qspca" + "version": "0.2.4", + "revision": "181da464f7edb5e675dd96cc25d611760796a739", + "url": "https://api.github.com/repos/andir/npins/tarball/0.2.4", + "hash": "04155dr6i1gy2zgy49v8zm75sn1akm83l4x8h6cxvxyk1l2abn4q" } }, "version": 3 From 6d83438f9377510c1b325ea039326efa1b368f23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 May 2024 15:40:38 +0000 Subject: [PATCH 040/111] zam-plugins: 4.2 -> 4.3 --- pkgs/applications/audio/zam-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 7d499ff1664e..11f039588882 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zam-plugins"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "zamaudio"; repo = pname; rev = version; - sha256 = "sha256-6TPZMDhGHqXjY8UYEqlr4hweF+W19IpIfSa9Bo9Ta1A="; + sha256 = "sha256-wT1BXQrcD+TI+trqx0ZVUmVLZMTDQgJI3dAvN54wy6Y="; fetchSubmodules = true; }; From 3195ca59c8c7541dc39b4b1f72f74620c2dd0333 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 May 2024 16:59:05 +0000 Subject: [PATCH 041/111] python311Packages.limnoria: 2023.11.18 -> 2024.4.26 --- 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 b791095ed68d..3eba2971c645 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2023.11.18"; + version = "2024.4.26"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Ftm5OGTt1emQsYso3hAUA9yMNBkIK5jybdFaRKJJk0o="; + hash = "sha256-H8GAJvmkYJy8PJsXn4Yl9qY3zb9aFBa7sr4DN0bKYfQ="; }; propagatedBuildInputs = [ From 86669c5217b9e8e1a742514e3f386b9fa0ff4e90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 May 2024 17:49:59 +0000 Subject: [PATCH 042/111] python311Packages.pytorch-lightning: 2.2.3 -> 2.2.4 --- pkgs/development/python-modules/pytorch-lightning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index a09e91fca0ce..780b2be18ca7 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.2.3"; + version = "2.2.4"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-5dz4NQZC0tKIYA9omRZAsSlvH5hpyCSmV0yvoRICcqg="; + hash = "sha256-IkoSID7nEPbKrhEMlo/UaMcF80HYldvndFA54DoHT+M="; }; preConfigure = '' From 53c2fa78f091be3223c9a510ee29912c752c2e03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 May 2024 20:19:14 +0000 Subject: [PATCH 043/111] python311Packages.imgtool: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/imgtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imgtool/default.nix b/pkgs/development/python-modules/imgtool/default.nix index dc8a9ec63089..52f203f9b1e9 100644 --- a/pkgs/development/python-modules/imgtool/default.nix +++ b/pkgs/development/python-modules/imgtool/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "imgtool"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-elQSVeae7B8Sqjjc4fHU/iDYISZ3xoqbbsY0ypGgZhI="; + hash = "sha256-T3+831PETqqmImUEUQzLUvfvAMmXUDz5STSzMMlge2A="; }; nativeBuildInputs = [ From 9a907c13afddceb3737ad6433b205b7612504d60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 05:47:14 +0000 Subject: [PATCH 044/111] python311Packages.unstructured: 0.13.4 -> 0.13.7 --- pkgs/development/python-modules/unstructured/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index a2de52233413..1340b1c79c7e 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -56,7 +56,7 @@ , grpcio }: let - version = "0.13.4"; + version = "0.13.7"; optional-dependencies = { huggingflace = [ langdetect @@ -90,7 +90,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-HAZVnyjbeHF6knipTxmmy/BI1wvoJ8c65PiMAIqgJ+0="; + hash = "sha256-Ekfa454mL7isMX79bd/YXPPHnetSzo1Mlg/XJakYyDM="; }; propagatedBuildInputs = [ From 1f7e33d7095202c917860c26db664f97016f3b63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 07:59:25 +0000 Subject: [PATCH 045/111] python311Packages.globus-sdk: 3.39.0 -> 3.41.0 --- pkgs/development/python-modules/globus-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 5cb49c0e9723..646fb31650d1 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.39.0"; + version = "3.41.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-DjGwwpXzYRq5/hiUs/l8kD/yA58vbhvrKirKDlWoAmY="; + hash = "sha256-FQO1D960mg0G/zYMo4J5MtJbPID4oE8UWNpTPKWtsic="; }; build-system = [ From 0755c03103ff270fec105c352a45b876f4e86c3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 08:15:17 +0000 Subject: [PATCH 046/111] python311Packages.rotary-embedding-torch: 0.5.3 -> 0.6.1 --- .../python-modules/rotary-embedding-torch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix index a04262e40173..22720a759238 100644 --- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix +++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "rotary-embedding-torch"; - version = "0.5.3"; + version = "0.6.1"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "rotary-embedding-torch"; rev = "refs/tags/${version}"; - hash = "sha256-CCz/va5oydgU1JRDHKooRezbDbeGZHtD8Zy6fWJ2uRg="; + hash = "sha256-/gVBQ9lUzVN/eEtm6qPajw0TZs87JOC7d02qnQ8sdVk="; }; nativeBuildInputs = [ From 383f244dd5d217d1033cc9076c70fa3288f7cc18 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 May 2024 13:53:31 +0200 Subject: [PATCH 047/111] python312Packages.aiocoap: 0.4.7 -> 0.4.8 Diff: https://github.com/chrysn/aiocoap/compare/refs/tags/0.4.7...0.4.8 Changelog: https://github.com/chrysn/aiocoap/blob/0.4.8/NEWS --- pkgs/development/python-modules/aiocoap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix index af2b220a21c2..cbc1c80258b5 100644 --- a/pkgs/development/python-modules/aiocoap/default.nix +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "aiocoap"; - version = "0.4.7"; + version = "0.4.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "chrysn"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4iwoPfmIwk+PlWUp60aqA5qZgzyj34pnZHf9uH5UhnY="; + hash = "sha256-jBRxorHr5/CgAR6WVXBUycZpJ6n1DYVFQk6kqVv8D1Q="; }; nativeBuildInputs = [ From 906e8df0324f541e30c56600debab2e1baa0569d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 May 2024 13:56:57 +0200 Subject: [PATCH 048/111] python312Packages.aiocoap: refactor --- .../python-modules/aiocoap/default.nix | 58 ++++++++----------- 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix index cbc1c80258b5..3d094802caf5 100644 --- a/pkgs/development/python-modules/aiocoap/default.nix +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -1,25 +1,19 @@ { lib , buildPythonPackage -, fetchFromGitHub -, pythonAtLeast -, pythonOlder - -# build-system -, setuptools - -# optionals -, cbor2 , cbor-diag +, cbor2 , cryptography +, dtlssocket +, fetchFromGitHub , filelock , ge25519 -, dtlssocket -, websockets -, termcolor , pygments - -# tests , pytestCheckHook +, pythonAtLeast +, pythonOlder +, setuptools +, termcolor +, websockets }: buildPythonPackage rec { @@ -31,12 +25,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chrysn"; - repo = pname; + repo = "aiocoap"; rev = "refs/tags/${version}"; hash = "sha256-jBRxorHr5/CgAR6WVXBUycZpJ6n1DYVFQk6kqVv8D1Q="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; @@ -65,23 +59,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = lib.optionals (pythonAtLeast "3.12") [ - # https://github.com/chrysn/aiocoap/issues/339 - "--deselect=tests/test_server.py::TestServerTCP::test_big_resource" - "--deselect=tests/test_server.py::TestServerTCP::test_empty_accept" - "--deselect=tests/test_server.py::TestServerTCP::test_error_resources" - "--deselect=tests/test_server.py::TestServerTCP::test_fast_resource" - "--deselect=tests/test_server.py::TestServerTCP::test_js_accept" - "--deselect=tests/test_server.py::TestServerTCP::test_manualbig_resource" - "--deselect=tests/test_server.py::TestServerTCP::test_nonexisting_resource" - "--deselect=tests/test_server.py::TestServerTCP::test_replacing_resource" - "--deselect=tests/test_server.py::TestServerTCP::test_root_resource" - "--deselect=tests/test_server.py::TestServerTCP::test_slow_resource" - "--deselect=tests/test_server.py::TestServerTCP::test_slowbig_resource" - "--deselect=tests/test_server.py::TestServerTCP::test_spurious_resource" - "--deselect=tests/test_server.py::TestServerTCP::test_unacceptable_accept" - ]; - disabledTestPaths = [ # Don't test the plugins "tests/test_tls.py" @@ -92,6 +69,21 @@ buildPythonPackage rec { disabledTests = [ # Communication is not properly mocked "test_uri_parser" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/chrysn/aiocoap/issues/339 + "TestServerTCP::test_big_resource" + "TestServerTCP::test_empty_accept" + "TestServerTCP::test_error_resources" + "TestServerTCP::test_fast_resource" + "TestServerTCP::test_js_accept" + "TestServerTCP::test_manualbig_resource" + "TestServerTCP::test_nonexisting_resource" + "TestServerTCP::test_replacing_resource" + "TestServerTCP::test_root_resource" + "TestServerTCP::test_slow_resource" + "TestServerTCP::test_slowbig_resource" + "TestServerTCP::test_spurious_resource" + "TestServerTCP::test_unacceptable_accept" ]; pythonImportsCheck = [ From 2c4139d45ef00a7e174eeec9d0d1d0acd271affb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 May 2024 13:57:14 +0200 Subject: [PATCH 049/111] python312Packages.aiocoap: format with nixfmt --- .../python-modules/aiocoap/default.nix | 93 +++++++++---------- 1 file changed, 43 insertions(+), 50 deletions(-) diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix index 3d094802caf5..5aff82034bcc 100644 --- a/pkgs/development/python-modules/aiocoap/default.nix +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -1,19 +1,20 @@ -{ lib -, buildPythonPackage -, cbor-diag -, cbor2 -, cryptography -, dtlssocket -, fetchFromGitHub -, filelock -, ge25519 -, pygments -, pytestCheckHook -, pythonAtLeast -, pythonOlder -, setuptools -, termcolor -, websockets +{ + lib, + buildPythonPackage, + cbor-diag, + cbor2, + cryptography, + dtlssocket, + fetchFromGitHub, + filelock, + ge25519, + pygments, + pytestCheckHook, + pythonAtLeast, + pythonOlder, + setuptools, + termcolor, + websockets, }: buildPythonPackage rec { @@ -30,9 +31,7 @@ buildPythonPackage rec { hash = "sha256-jBRxorHr5/CgAR6WVXBUycZpJ6n1DYVFQk6kqVv8D1Q="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; passthru.optional-dependencies = { oscore = [ @@ -41,12 +40,8 @@ buildPythonPackage rec { filelock ge25519 ]; - tinydtls = [ - dtlssocket - ]; - ws = [ - websockets - ]; + tinydtls = [ dtlssocket ]; + ws = [ websockets ]; prettyprint = [ termcolor cbor2 @@ -55,9 +50,7 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ # Don't test the plugins @@ -66,29 +59,29 @@ buildPythonPackage rec { "tests/test_oscore_plugtest.py" ]; - disabledTests = [ - # Communication is not properly mocked - "test_uri_parser" - ] ++ lib.optionals (pythonAtLeast "3.12") [ - # https://github.com/chrysn/aiocoap/issues/339 - "TestServerTCP::test_big_resource" - "TestServerTCP::test_empty_accept" - "TestServerTCP::test_error_resources" - "TestServerTCP::test_fast_resource" - "TestServerTCP::test_js_accept" - "TestServerTCP::test_manualbig_resource" - "TestServerTCP::test_nonexisting_resource" - "TestServerTCP::test_replacing_resource" - "TestServerTCP::test_root_resource" - "TestServerTCP::test_slow_resource" - "TestServerTCP::test_slowbig_resource" - "TestServerTCP::test_spurious_resource" - "TestServerTCP::test_unacceptable_accept" - ]; + disabledTests = + [ + # Communication is not properly mocked + "test_uri_parser" + ] + ++ lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/chrysn/aiocoap/issues/339 + "TestServerTCP::test_big_resource" + "TestServerTCP::test_empty_accept" + "TestServerTCP::test_error_resources" + "TestServerTCP::test_fast_resource" + "TestServerTCP::test_js_accept" + "TestServerTCP::test_manualbig_resource" + "TestServerTCP::test_nonexisting_resource" + "TestServerTCP::test_replacing_resource" + "TestServerTCP::test_root_resource" + "TestServerTCP::test_slow_resource" + "TestServerTCP::test_slowbig_resource" + "TestServerTCP::test_spurious_resource" + "TestServerTCP::test_unacceptable_accept" + ]; - pythonImportsCheck = [ - "aiocoap" - ]; + pythonImportsCheck = [ "aiocoap" ]; meta = with lib; { description = "Python CoAP library"; From 1f2c3812d40de6c8a0c6dd908d27211af7d648fb Mon Sep 17 00:00:00 2001 From: Raroh73 <96078496+Raroh73@users.noreply.github.com> Date: Mon, 13 May 2024 17:01:33 +0200 Subject: [PATCH 050/111] nixos/llama-cpp: fix rocm support --- nixos/modules/services/misc/llama-cpp.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/misc/llama-cpp.nix b/nixos/modules/services/misc/llama-cpp.nix index c73cff027e22..2fa1a7b28e3b 100644 --- a/nixos/modules/services/misc/llama-cpp.nix +++ b/nixos/modules/services/misc/llama-cpp.nix @@ -92,7 +92,6 @@ in { SystemCallFilter = [ "@system-service" "~@privileged" - "~@resources" ]; SystemCallErrorNumber = "EPERM"; ProtectProc = "invisible"; From f74d9c79b4870a775325f35fb66064929fd8cfea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 01:50:42 +0000 Subject: [PATCH 051/111] python311Packages.llm: 0.13.1 -> 0.14 --- pkgs/development/python-modules/llm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index 5626da5e3858..582cba89763f 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -12,7 +12,7 @@ let llm = buildPythonPackage rec { pname = "llm"; - version = "0.13.1"; + version = "0.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ let owner = "simonw"; repo = "llm"; rev = "refs/tags/${version}"; - hash = "sha256-Nq6pduzl8IK+nA3pctst/W4ux7+P6mBFTEHMF+vtBQw="; + hash = "sha256-CgGVFUsntVkF0zORAtYQQMAeGtIwBbj9hE0Ei1OCGq4="; }; patches = [ From 099671c419e95121c4328909bce6ef94f75bb890 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Mon, 13 May 2024 23:34:03 -0700 Subject: [PATCH 052/111] nixosTests.installer: test nixos-option anew Someone put a FIXME in here. The FIXME looked really old. I uncommented out the thing and it still passes. Calling this fixed. --- nixos/tests/installer.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 7e835041eb39..b034d21146f3 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -249,12 +249,11 @@ let with subtest("Check whether nixos-rebuild works"): target.succeed("nixos-rebuild switch >&2") - # FIXME: Nix 2.4 broke nixos-option, someone has to fix it. - # with subtest("Test nixos-option"): - # kernel_modules = target.succeed("nixos-option boot.initrd.kernelModules") - # assert "virtio_console" in kernel_modules - # assert "List of modules" in kernel_modules - # assert "qemu-guest.nix" in kernel_modules + with subtest("Test nixos-option"): + kernel_modules = target.succeed("nixos-option boot.initrd.kernelModules") + assert "virtio_console" in kernel_modules + assert "List of modules" in kernel_modules + assert "qemu-guest.nix" in kernel_modules target.shutdown() From 7f4dbe203a89ac0c119aaef490dd819681e1e152 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 18:14:44 +0000 Subject: [PATCH 053/111] python311Packages.nocaselist: 2.0.0 -> 2.0.2 --- pkgs/development/python-modules/nocaselist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix index fcad1844e2f6..dd667c0a3c71 100644 --- a/pkgs/development/python-modules/nocaselist/default.nix +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "nocaselist"; - version = "2.0.0"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RWqgAMZ3fF0hsCnFLlMvlDKNT7TxWtKk3T3WLbMLOJI="; + hash = "sha256-MnCLcAoaUxM+a7XMUzMsl3Wwx8lZpflyV5MXH9L0yKU="; }; propagatedBuildInputs = [ From ff926785c5b4cae2e9f388d0b1a41183f7be496f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 15 May 2024 06:48:20 +0200 Subject: [PATCH 054/111] =?UTF-8?q?ocamlPackages.ocamlformat:=200.26.1=20?= =?UTF-8?q?=E2=86=92=200.26.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ocamlformat/generic.nix | 3 ++- pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocamlformat/generic.nix b/pkgs/development/ocaml-modules/ocamlformat/generic.nix index ca5c78bca7d9..f8f8c9d99195 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/generic.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/generic.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, version ? "0.26.1", astring, base, camlp-streams, cmdliner_1_0 +{ lib, fetchurl, version ? "0.26.2", astring, base, camlp-streams, cmdliner_1_0 , cmdliner_1_1, csexp, dune-build-info, either, fix, fpath, menhirLib, menhirSdk , ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf, ... }: @@ -24,6 +24,7 @@ rec { "0.25.1" = "sha256-3I8qMwyjkws2yssmI7s2Dti99uSorNKT29niJBpv0z0="; "0.26.0" = "sha256-AxSUq3cM7xCo9qocvrVmDkbDqmwM1FexEP7IWadeh30="; "0.26.1" = "sha256-2gBuQn8VuexhL7gI1EZZm9m3w+4lq+s9VVdHpw10xtc="; + "0.26.2" = "sha256-Lk9Za/eqNnqET+g7oPawvxSyplF53cCCNj/peT0DdcU="; }."${version}"; }; diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix index 7b1faaf3e88b..e56b86409685 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix @@ -12,7 +12,8 @@ let inherit (callPackage ./generic.nix args) src version library_deps; in -lib.throwIf (lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23") +lib.throwIf (lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23" + || lib.versionAtLeast ocaml.version "5.2" && !lib.versionAtLeast version "0.26.2") "ocamlformat ${version} is not available for OCaml ${ocaml.version}" buildDunePackage { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70c7e48a82bb..688b9cadbf35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16491,7 +16491,7 @@ with pkgs; ocamlformat # latest version ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1 - ocamlformat_0_26_0 ocamlformat_0_26_1; + ocamlformat_0_26_0 ocamlformat_0_26_1 ocamlformat_0_26_2; inherit (ocamlPackages) odig; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 0e67b4d96bdc..74661127c3d7 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1292,6 +1292,7 @@ let ocamlformat_0_25_1 = ocamlformat.override { version = "0.25.1"; }; ocamlformat_0_26_0 = ocamlformat.override { version = "0.26.0"; }; ocamlformat_0_26_1 = ocamlformat.override { version = "0.26.1"; }; + ocamlformat_0_26_2 = ocamlformat.override { version = "0.26.2"; }; ocamlformat = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat.nix {}; From 532d9fbcd974a62e97585069a508b4c112d78fba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 May 2024 06:36:27 +0000 Subject: [PATCH 055/111] radarr: 5.4.6.8723 -> 5.6.0.8846 --- pkgs/servers/radarr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index b1b228a37ec9..6efac9d1e820 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -10,15 +10,15 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-eFJ31tZPxzK1Vx2EOZ1AMrzCUL7pXJIb5J1joL/ZIgs="; - arm64-linux_hash = "sha256-BtxHBHc2dYYdqZxwga7K49aGfSq5a8Z1TLjMPH4ldlw="; - x64-osx_hash = "sha256-GQ8wHU4wWu6fpjiLI9yQyMvhP1DS5FE+YQu2uLFdto4="; - arm64-osx_hash = "sha256-AnZ+mGeafJsRb6Koj0+oaER8d6vuDQ0x+Wc1eflzupo="; + x64-linux_hash = "sha256-rKe1xQR3lkPXQBUWmKdHUu/AQ99U1kCINeXV2z/ZG5o="; + arm64-linux_hash = "sha256-O/6brSo25E4BxvxAUQvwQa9kMY/Ga3YxgS+fuaL6/n0="; + x64-osx_hash = "sha256-oVBs0evwPl3Dd6GZlzUWqopB0Zq4mOCUwmLOjs44d6Q="; + arm64-osx_hash = "sha256-iUBy9ob2zOdKVhGbwsJx1ZrT9tD4D1BPLqjB46tCW08="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "5.4.6.8723"; + version = "5.6.0.8846"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; From 4d2f6976c50c46763e1fd919d495d3a27df80183 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 15 May 2024 08:53:16 +0200 Subject: [PATCH 056/111] lektor: 3.4.0b8 -> 3.4.0b12 https://github.com/lektor/lektor/blob/v3.4.0b12/CHANGES.md https://github.com/lektor/lektor/compare/v3.4.0b8...v3.4.0b12 --- pkgs/tools/misc/lektor/default.nix | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/misc/lektor/default.nix b/pkgs/tools/misc/lektor/default.nix index aef55ffb9b1f..be92bc2723fb 100644 --- a/pkgs/tools/misc/lektor/default.nix +++ b/pkgs/tools/misc/lektor/default.nix @@ -23,19 +23,19 @@ let in python.pkgs.buildPythonApplication rec { pname = "lektor"; - version = "3.4.0b8"; + version = "3.4.0b12"; format = "pyproject"; src = fetchFromGitHub { owner = "lektor"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FtmRW4AS11zAX2jvGY8XTsPrN3mhHkIWoFY7sXmqG/U="; + hash = "sha256-USwHSUXpk4XM5ySTXnYc5FqqkTaf8PoxQTeRnWOvbxk="; }; npmDeps = fetchNpmDeps { - src = "${src}/frontend"; - hash = "sha256-Z7LP9rrVSzKoLITUarsnRbrhIw7W7TZSZUgV/OT+m0M="; + src = "${src}/${npmRoot}"; + hash = "sha256-LXe5/u4nAGig8RSu6r8Qsr3p3Od8eoMxukW8Z4HkJ44="; }; npmRoot = "frontend"; @@ -50,8 +50,6 @@ python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ babel click - exifread - filetype flask inifile jinja2 @@ -71,11 +69,6 @@ python.pkgs.buildPythonApplication rec { pytest-click pytest-mock pytestCheckHook - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - "werkzeug" ]; postInstall = '' @@ -90,16 +83,18 @@ python.pkgs.buildPythonApplication rec { # Tests require network access "test_path_installed_plugin_is_none" "test_VirtualEnv_run_pip_install" - # expects FHS paths - "test_VirtualEnv_executable" ]; - meta = with lib; { + postCheck = '' + make test-js + ''; + + meta = { description = "A static content management system"; homepage = "https://www.getlektor.com/"; changelog = "https://github.com/lektor/lektor/blob/v${version}/CHANGES.md"; - license = licenses.bsd0; + license = lib.licenses.bsd3; mainProgram = "lektor"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } From 05d4016df18bd56fda02b980aeb00c09f882201f Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 15 May 2024 18:48:24 +0800 Subject: [PATCH 057/111] goda: 0.5.7 -> 0.5.8 --- pkgs/development/tools/goda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/goda/default.nix b/pkgs/development/tools/goda/default.nix index 19d363e1ef55..df8de49277cf 100644 --- a/pkgs/development/tools/goda/default.nix +++ b/pkgs/development/tools/goda/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goda"; - version = "0.5.7"; + version = "0.5.8"; src = fetchFromGitHub { owner = "loov"; repo = "goda"; rev = "v${version}"; - sha256 = "sha256-kilFb/2wXdzn/gXy9mBg0PZH8rd+MFIom4AGAZLgnBo="; + hash = "sha256-WmOe3MfFWUnFSuwntHUjN+NeeT7TdxfBOgciviYZC0Y="; }; vendorHash = "sha256-FYjlOYB0L4l6gF8hYtJroV1qMQD0ZmKWXBarjyConRs="; From 7fa28abd0ad4d9ac95a1ca53bda2f9b9dc90a031 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 May 2024 11:06:20 +0000 Subject: [PATCH 058/111] python311Packages.dramatiq: 1.16.0 -> 1.17.0 --- pkgs/development/python-modules/dramatiq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dramatiq/default.nix b/pkgs/development/python-modules/dramatiq/default.nix index 35c2b79c438d..fb434bf0e8b4 100644 --- a/pkgs/development/python-modules/dramatiq/default.nix +++ b/pkgs/development/python-modules/dramatiq/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dramatiq"; - version = "1.16.0"; + version = "1.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Bogdanp"; repo = "dramatiq"; rev = "refs/tags/v${version}"; - hash = "sha256-gC1vWnG3zDuFT61i2VgDrP/qIwmGN5GkGv6EVxqUf4U="; + hash = "sha256-xKHTBo2AirxDXe/CLSqo++3AgxP4pVkGTNdgS5CCZ3c="; }; propagatedBuildInputs = [ From cd833bc84ed588a8a85345c02295e79106d80be7 Mon Sep 17 00:00:00 2001 From: isabel Date: Tue, 14 May 2024 18:44:13 +0100 Subject: [PATCH 059/111] gitprompt-rs: move to by-name --- .../gi/gitprompt-rs/package.nix} | 18 ++++++++++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 insertions(+), 8 deletions(-) rename pkgs/{applications/version-management/gitprompt-rs/default.nix => by-name/gi/gitprompt-rs/package.nix} (73%) diff --git a/pkgs/applications/version-management/gitprompt-rs/default.nix b/pkgs/by-name/gi/gitprompt-rs/package.nix similarity index 73% rename from pkgs/applications/version-management/gitprompt-rs/default.nix rename to pkgs/by-name/gi/gitprompt-rs/package.nix index 4df54080513c..b7b1987ae53a 100644 --- a/pkgs/applications/version-management/gitprompt-rs/default.nix +++ b/pkgs/by-name/gi/gitprompt-rs/package.nix @@ -4,13 +4,16 @@ rustPlatform, git, }: -rustPlatform.buildRustPackage rec { - pname = "gitprompt-rs"; +let version = "0.3.0"; +in +rustPlatform.buildRustPackage { + pname = "gitprompt-rs"; + inherit version; src = fetchFromGitHub { owner = "9ary"; - repo = pname; + repo = "gitprompt-rs"; rev = version; hash = "sha256-BqI3LbG7I/0wjzJaP8bxRwTM56joLqVaQCmAydX5vQM="; }; @@ -22,11 +25,14 @@ rustPlatform.buildRustPackage rec { --replace 'Command::new("git")' 'Command::new("${git}/bin/git")' ''; - meta = with lib; { + meta = { description = "Simple Git prompt"; homepage = "https://github.com/9ary/gitprompt-rs"; - license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ isabelroses cafkafk ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ + isabelroses + cafkafk + ]; mainProgram = "gitprompt-rs"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70c7e48a82bb..6e13d6e4f72d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2495,8 +2495,6 @@ with pkgs; gitnr = callPackage ../applications/version-management/gitnr { }; - gitprompt-rs = callPackage ../applications/version-management/gitprompt-rs/default.nix { }; - gitsign = callPackage ../applications/version-management/gitsign { }; gitstats = callPackage ../applications/version-management/gitstats { }; From bed919271ea1ea001f68a84b5a6cf2caade5f632 Mon Sep 17 00:00:00 2001 From: isabel Date: Tue, 14 May 2024 18:39:23 +0100 Subject: [PATCH 060/111] goflow2: move to by-name --- .../go/goflow2/package.nix} | 15 +++++++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 9 insertions(+), 8 deletions(-) rename pkgs/{tools/networking/goflow2/default.nix => by-name/go/goflow2/package.nix} (75%) diff --git a/pkgs/tools/networking/goflow2/default.nix b/pkgs/by-name/go/goflow2/package.nix similarity index 75% rename from pkgs/tools/networking/goflow2/default.nix rename to pkgs/by-name/go/goflow2/package.nix index 6edd9b87f657..e360c5253ef9 100644 --- a/pkgs/tools/networking/goflow2/default.nix +++ b/pkgs/by-name/go/goflow2/package.nix @@ -3,13 +3,16 @@ buildGoModule, fetchFromGitHub, }: -buildGoModule rec { - pname = "goflow2"; +let version = "2.1.3"; +in +buildGoModule { + pname = "goflow2"; + inherit version; src = fetchFromGitHub { owner = "netsampler"; - repo = pname; + repo = "goflow2"; rev = "v${version}"; hash = "sha256-wtvBkk+Y4koGDGN+N/w4FsdejgpCIio0g2QV35Pr/fo="; }; @@ -22,10 +25,10 @@ buildGoModule rec { vendorHash = "sha256-qcWeIg278V2bgFGpWwUT5JCblxfBv0/gWV1oXul/nCQ="; - meta = with lib; { + meta = { description = "High performance sFlow/IPFIX/NetFlow Collector"; homepage = "https://github.com/netsampler/goflow2"; - license = licenses.bsd3; - maintainers = with maintainers; [ isabelroses ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ isabelroses ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70c7e48a82bb..d97be74a0d8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1841,8 +1841,6 @@ with pkgs; goflow = callPackage ../tools/networking/goflow { }; - goflow2 = callPackage ../tools/networking/goflow2 { }; - gofu = callPackage ../applications/misc/gofu { }; godspeed = callPackage ../tools/networking/godspeed { }; From c2bc33647f4c4b856ee28589322b7f913050f1f8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 15 May 2024 17:20:54 +0200 Subject: [PATCH 061/111] strace: 6.8 -> 6.9 ChangeLog: https://github.com/strace/strace/releases/tag/v6.9 --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 3cae7fc017d4..e1cd72ea683a 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "6.8"; + version = "6.9"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-umlQqWgkzfk6WE+gTwpzOJbSprxfCtn/5QXZtB6XAUk="; + sha256 = "sha256-2hiemQqC48o6WkYxAS9+z9SJ2rRZhU2C2Mr2qGXBNWo="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From a5047b359ae384ff4dc8d92c09709e2b9294128e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 May 2024 15:45:47 +0000 Subject: [PATCH 062/111] python311Packages.justext: 3.0.0 -> 3.0.1 --- pkgs/development/python-modules/justext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/justext/default.nix b/pkgs/development/python-modules/justext/default.nix index 82f0aa804565..2446dccf0823 100644 --- a/pkgs/development/python-modules/justext/default.nix +++ b/pkgs/development/python-modules/justext/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "justext"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; src = fetchFromGitHub { owner = "miso-belica"; repo = "jusText"; rev = "refs/tags/v${version}"; - hash = "sha256-WNxDoM5666tEHS9pMl5dOoig4S7dSYaCLZq71tehWqw="; + hash = "sha256-9i7hzCK/ijh8xw9l2ZbVhVj5IBf0WD/49/R1tSWgqrQ="; }; propagatedBuildInputs = [ From 5fab9b7e2acb7ca125c588e19b336e4986aee157 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 May 2024 17:05:30 +0000 Subject: [PATCH 063/111] libewf-legacy: 20140814 -> 20140816 --- pkgs/by-name/li/libewf-legacy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libewf-legacy/package.nix b/pkgs/by-name/li/libewf-legacy/package.nix index f6505afdacec..536a28eceebe 100644 --- a/pkgs/by-name/li/libewf-legacy/package.nix +++ b/pkgs/by-name/li/libewf-legacy/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libewf-legacy"; - version = "20140814"; + version = "20140816"; src = fetchurl { url = "https://github.com/libyal/libewf-legacy/releases/download/${finalAttrs.version}/libewf-${finalAttrs.version}.tar.gz"; - hash = "sha256-OM3QXwnaIDeo66UNjzmu6to53SxgCMn/rE9VTPlX5BQ="; + hash = "sha256-ay0Hj7OGFnm6g5Qv6lHp5gKcN+wuoMN/V0QlbW9wJak="; }; nativeBuildInputs = [ pkg-config ]; From e2b8d9dac2083cbb6db4bb6c1cc8bbfc2ebfdb85 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 15 May 2024 19:27:56 +0200 Subject: [PATCH 064/111] python311Packages.django-allauth: use python.interpreter --- pkgs/development/python-modules/django-allauth/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 51ca1ea02de5..6046f1964d8f 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, python # build-system , setuptools @@ -56,7 +57,7 @@ buildPythonPackage rec { requests-oauthlib ] ++ pyjwt.optional-dependencies.crypto; - preBuild = "python -m django compilemessages"; + preBuild = "${python.interpreter} -m django compilemessages"; passthru.optional-dependencies = { saml = [ From 525339a9e4f87b21cb2e7f6e5579e5c5fce17204 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Wed, 15 May 2024 21:32:56 +0300 Subject: [PATCH 065/111] raycast: 1.73.0 -> 1.74.0 Changelog: https://www.raycast.com/changelog/1-74-0 --- pkgs/os-specific/darwin/raycast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index b985668b21dc..da73099da861 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -10,12 +10,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.73.0"; + version = "1.74.0"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-TiHFuU54+IDBrdIMSI397ysm8uOb2/oRhSyoy+5yzTw="; + hash = "sha256-aPpxPjEhy1uLekHMLyI18mlSozffMA+HB1OdqpULVnw="; }; dontPatch = true; From f484745c256dcae5496bb01ccd11d90204e7cca5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 May 2024 21:04:39 +0000 Subject: [PATCH 066/111] python311Packages.torchmetrics: 1.4.0 -> 1.4.0.post0 --- pkgs/development/python-modules/torchmetrics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index 5cc57ed0bed3..c9485359cb87 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -21,7 +21,7 @@ let pname = "torchmetrics"; - version = "1.4.0"; + version = "1.4.0.post0"; in buildPythonPackage { inherit pname version; @@ -33,7 +33,7 @@ buildPythonPackage { owner = "Lightning-AI"; repo = "torchmetrics"; rev = "refs/tags/v${version}"; - hash = "sha256-5ANEpUdd5eyzBhhAEHrvHNHMOQuXhkkKuL1t3dJLhdE="; + hash = "sha256-tQqlLfdk8rSJqwR3rC7kqnM+pLFYZSPHfI7RmIi2Iq4="; }; dependencies = [ From 03e1c4b2456bf580b5838cad0ef0184fa12b5d1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 May 2024 22:22:20 +0000 Subject: [PATCH 067/111] ngtcp2: 1.4.0 -> 1.5.0 --- pkgs/development/libraries/ngtcp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index 6a0e15dfcd9c..ada0ab55dfd6 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-te/kFt7/09QpmkHZ7dJxyKvvxP+mHtIQIgESkJATR38="; + hash = "sha256-Ez97uFzXvI7cE2TIk4/RCAwbAf+vXG1PlPaSvdSrcnE="; fetchSubmodules = true; }; From bae5bd29dea286a166310b15999c169cca801976 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 May 2024 22:24:50 +0000 Subject: [PATCH 068/111] skaffold: 2.11.0 -> 2.12.0 --- pkgs/development/tools/skaffold/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index a67c430dbfc1..da1a2db8c86c 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-xaRVgvYK6xWSy75K7AOkSw4ZjXn3xR0NqbBBbbK5MVU="; + hash = "sha256-q57n5Jo682u/YK+5bgYqMufjPuPOPsBgJzxSl1fdqxA="; }; vendorHash = null; From b31f3fa2e91b0d5c7cc70106b37e9281da65f52c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 May 2024 23:50:53 +0000 Subject: [PATCH 069/111] python311Packages.nbdev: 2.3.20 -> 2.3.21 --- pkgs/development/python-modules/nbdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index 389f0977677d..4178f611e43d 100644 --- a/pkgs/development/python-modules/nbdev/default.nix +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "nbdev"; - version = "2.3.20"; + version = "2.3.21"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tBrWdG8njNQzQ3kc0ATeu3ToP34gdmOBKj2jcB0X8+8="; + hash = "sha256-H3KHnVOdy+Hdpka+dxp/qPj1HZSXIbXJshnZuXVo9DQ="; }; nativeBuildInputs = [ From 77b7d6fbf02724a1a4031487a6258b369a2f93c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 May 2024 00:27:23 +0000 Subject: [PATCH 070/111] bitcoind-abc: 0.29.3 -> 0.29.4 --- pkgs/applications/blockchains/bitcoin-abc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 948645d60006..7a41062d6bf1 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -25,13 +25,13 @@ mkDerivation rec { pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; - version = "0.29.3"; + version = "0.29.4"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - hash = "sha256-hYA0O7nDT8J1EnpW4i1+eBzkNw77JC6M7GwO3BdBh3U="; + hash = "sha256-RT9sdwwF39arW2AnoQ9KnRzYqhnQhpjWU1eykTiKWSo="; }; nativeBuildInputs = [ pkg-config cmake ]; From d8b0af3518f5071ce9640091e002b2ce877aa47c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 May 2024 00:27:54 +0000 Subject: [PATCH 071/111] bitcoin-abc: 0.29.3 -> 0.29.4 --- pkgs/applications/blockchains/bitcoin-abc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 948645d60006..7a41062d6bf1 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -25,13 +25,13 @@ mkDerivation rec { pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; - version = "0.29.3"; + version = "0.29.4"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - hash = "sha256-hYA0O7nDT8J1EnpW4i1+eBzkNw77JC6M7GwO3BdBh3U="; + hash = "sha256-RT9sdwwF39arW2AnoQ9KnRzYqhnQhpjWU1eykTiKWSo="; }; nativeBuildInputs = [ pkg-config cmake ]; From a5226abe376a197b724b7ea72a37f42f0dace8ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 May 2024 01:03:15 +0000 Subject: [PATCH 072/111] grpc-gateway: 2.19.1 -> 2.20.0 --- pkgs/development/tools/grpc-gateway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/development/tools/grpc-gateway/default.nix index 83d5a575b838..39621abf85eb 100644 --- a/pkgs/development/tools/grpc-gateway/default.nix +++ b/pkgs/development/tools/grpc-gateway/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.19.1"; + version = "2.20.0"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; rev = "v${version}"; - sha256 = "sha256-CdGQpQfOSimeio8v1lZ7xzE/oAS2qFyu+uN+H9i7vpo="; + sha256 = "sha256-CnnJRgEGarwIaE2LkphN3gogzIhwQ5hAaUZFpLR/HxU="; }; - vendorHash = "sha256-no7kZGpf/VOuceC3J+izGFQp5aMS3b+Rn+x4BFZ2zgs="; + vendorHash = "sha256-aNOWu+TXbXn3jZ29BwU+x+vWMtL76NZoPElFuUwcHiI="; ldflags = [ "-X=main.version=${version}" From 421ed78cd2d6dcd24b09c0b1c67349318ceefa9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 May 2024 01:44:34 +0000 Subject: [PATCH 073/111] python311Packages.cvelib: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/cvelib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/development/python-modules/cvelib/default.nix index c269c351c1da..1c5fc15b94b9 100644 --- a/pkgs/development/python-modules/cvelib/default.nix +++ b/pkgs/development/python-modules/cvelib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cvelib"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RedHatProductSecurity"; repo = "cvelib"; - rev = "tags/${version}"; - hash = "sha256-PCZUAKgE80PD//4qK8ap55IN9vtx9WdpRZUAC3UdaWM="; + rev = "refs/tags/${version}"; + hash = "sha256-nj5bkep8jYJE1qh2zNxivjKOpHj93UZ8bU+qNs2On8s="; }; propagatedBuildInputs = [ From c4cb8c842171c6016332ad71499d2eeea4df8b6f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 16 May 2024 04:20:00 +0000 Subject: [PATCH 074/111] nodejs_22: 22.1.0 -> 22.2.0 Changelog: https://github.com/nodejs/node/releases/tag/v22.2.0 --- pkgs/development/web/nodejs/v22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 63736088b5f1..676ef1c7e545 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "22.1.0"; - sha256 = "sha256-nX1fQNnb1iYMmbXklLX5vHVejw/6xw4SGtzl+0QvI8s="; + version = "22.2.0"; + sha256 = "sha256-iJkIqIKNFISRDX5lm2qlet6NUo/w45Dpp372WadihHQ="; patches = [ ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch From f7556e377bca7bfcf529e002853786c2b16104d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 May 2024 05:09:08 +0000 Subject: [PATCH 075/111] python311Packages.curl-cffi: 0.6.3 -> 0.6.4 --- pkgs/development/python-modules/curl-cffi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix index 3f752f703bf7..00b87dff252e 100644 --- a/pkgs/development/python-modules/curl-cffi/default.nix +++ b/pkgs/development/python-modules/curl-cffi/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "curl-cffi"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "yifeikong"; repo = "curl_cffi"; - rev = "v${version}"; - hash = "sha256-VeBh5wp/VEMDGR2YK06w34hBv9qHIyA+EiZHrhEhAGw="; + rev = "refs/tags/v${version}"; + hash = "sha256-bNBpZAIdfub2osByo827RBw/gouCmNt8uVN0y1KdcUk="; }; patches = [ From 36afe6c5e6768794dc1d8fe65d34a11b0253749c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 May 2024 06:41:40 +0000 Subject: [PATCH 076/111] python311Packages.lmfit: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/lmfit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lmfit/default.nix b/pkgs/development/python-modules/lmfit/default.nix index 5df47bc867a1..a7e8c6970bdb 100644 --- a/pkgs/development/python-modules/lmfit/default.nix +++ b/pkgs/development/python-modules/lmfit/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "lmfit"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-foI668BSN8qA0z0mDO27peJhkMzsn69ZXmgUOQneDJM="; + hash = "sha256-vDhiRK29EO8aKixPnRez3vkFVSwKZK74VPCtRswwnMU="; }; postPatch = '' From a958ef6f83386d149c82dfcc33e40f6c71b352fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 May 2024 09:13:51 +0200 Subject: [PATCH 077/111] python312Packages.cvelib: refactor --- .../python-modules/cvelib/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/development/python-modules/cvelib/default.nix index 1c5fc15b94b9..72abff8eccfa 100644 --- a/pkgs/development/python-modules/cvelib/default.nix +++ b/pkgs/development/python-modules/cvelib/default.nix @@ -1,19 +1,20 @@ { lib , buildPythonPackage , click +, cve , fetchFromGitHub , jsonschema , pytestCheckHook , pythonOlder , requests +, setuptools , testers -, cve }: buildPythonPackage rec { pname = "cvelib"; version = "1.4.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +25,17 @@ buildPythonPackage rec { hash = "sha256-nj5bkep8jYJE1qh2zNxivjKOpHj93UZ8bU+qNs2On8s="; }; - propagatedBuildInputs = [ + postPatch = '' + # collective.checkdocs is unmaintained for over 10 years + substituteInPlace pyproject.toml \ + --replace-fail '"collective.checkdocs",' "" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ click jsonschema requests @@ -43,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library and a command line interface for the CVE Services API"; homepage = "https://github.com/RedHatProductSecurity/cvelib"; + changelog = "https://github.com/RedHatProductSecurity/cvelib/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ raboof ]; mainProgram = "cve"; From 4eeb3f366191b4e3e789b923b1b35821d9f6ac79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 May 2024 09:14:07 +0200 Subject: [PATCH 078/111] python312Packages.cvelib: format with nixfmt --- .../python-modules/cvelib/default.nix | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/development/python-modules/cvelib/default.nix index 72abff8eccfa..b51d4ea6f64f 100644 --- a/pkgs/development/python-modules/cvelib/default.nix +++ b/pkgs/development/python-modules/cvelib/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, click -, cve -, fetchFromGitHub -, jsonschema -, pytestCheckHook -, pythonOlder -, requests -, setuptools -, testers +{ + lib, + buildPythonPackage, + click, + cve, + fetchFromGitHub, + jsonschema, + pytestCheckHook, + pythonOlder, + requests, + setuptools, + testers, }: buildPythonPackage rec { @@ -31,9 +32,7 @@ buildPythonPackage rec { --replace-fail '"collective.checkdocs",' "" ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ click @@ -41,13 +40,9 @@ buildPythonPackage rec { requests ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "cvelib" - ]; + pythonImportsCheck = [ "cvelib" ]; passthru.tests.version = testers.testVersion { package = cve; }; From 829d881bd4b49ac022441254ea81227023ea31eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 May 2024 07:17:52 +0000 Subject: [PATCH 079/111] python311Packages.dataprep-ml: 0.0.23 -> 24.5.1.2 --- pkgs/development/python-modules/dataprep-ml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dataprep-ml/default.nix b/pkgs/development/python-modules/dataprep-ml/default.nix index 3bb919b6dc10..eef2f7f4f6fa 100644 --- a/pkgs/development/python-modules/dataprep-ml/default.nix +++ b/pkgs/development/python-modules/dataprep-ml/default.nix @@ -27,7 +27,7 @@ let in buildPythonPackage rec { pname = "dataprep-ml"; - version = "0.0.23"; + version = "24.5.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "dataprep_ml"; inherit version; - hash = "sha256-NYlKLdV2xZPODXpHvaFB8cRFTdCndl3UOd6bCfNbsZo="; + hash = "sha256-pZhHlNcQJLBww7ur2Z6Yb2IdbRsBtjzQAzfa4UzGKt4="; }; pythonRelaxDeps = [ From c3bc597e69a6c13e0690a497af787edc6fe6c321 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 May 2024 09:54:18 +0200 Subject: [PATCH 080/111] checkov: 3.2.91 -> 3.2.92 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.91...3.2.92 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.92 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index b1d98d834488..9cf0dc6653b4 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.91"; + version = "3.2.92"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-lw89E7xD1tSAxgf1bwuPojOikOqIBfisePAtTGHXr4c="; + hash = "sha256-v1StSo9j0Psr3om3qbcE+Ha9Wz7t6EfGzbyAe34M2qY="; }; patches = [ ./flake8-compat-5.x.patch ]; From a960f7d0e040fd5d706a72c6cb488399709d5f1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 May 2024 09:55:34 +0200 Subject: [PATCH 081/111] python312Packages.tencentcloud-sdk-python: 3.0.1146 -> 3.0.1148 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1146...3.0.1148 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1148/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 4e9f41bfaf1a..f4c3b51fa20e 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1146"; + version = "3.0.1148"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-4U+nI5DODPLgQXzzgZKVTZdKPVneUQVomsdpoQHRqdE="; + hash = "sha256-dGLc/oPwQlzNKuw/xszgld0KQf/l7roG3H7jIlJspp0="; }; build-system = [ setuptools ]; From 2ce3adff883d7bb708e11210572eb6c77aa6c986 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 May 2024 08:01:31 +0000 Subject: [PATCH 082/111] python311Packages.pgspecial: 2.1.1 -> 2.1.2 --- pkgs/development/python-modules/pgspecial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 5c4e1bf84a2a..21408918e06a 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pgspecial"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-o4I5zZYfrDPObaNcRm11istvlCkBWY19905bgv5vVjY="; + hash = "sha256-8EGeGzt4+zpy/jtUb2eIpxIJFTLVmf51k7X27lWoj4c="; }; propagatedBuildInputs = [ From f3e46b03f5c9508699ee3ff7f043765e23c3d5b2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 May 2024 10:10:15 +0200 Subject: [PATCH 083/111] python312Packages.boto3-stubs: 1.34.105 -> 1.34.106 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index d93def6ac961..232350e9869b 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.105"; + version = "1.34.106"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-auwBMUR4haJNuCJ5YJoIEwxdCw9zjfxwpZ/z9FPASmg="; + hash = "sha256-1IQhTwKkT27syAEO82MwPclTfxPoElur9HYGaYrGjCA="; }; build-system = [ setuptools ]; From 47bf9e5229ed0d3ecd358e843c2127824921d78d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 May 2024 10:11:31 +0200 Subject: [PATCH 084/111] python312Packages.langchain-text-splitters: 0.0.1 -> 0.0.2 --- .../python-modules/langchain-text-splitters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index 81cb942e5155..f8eaf117e3a9 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.0.1"; + version = "0.0.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_text_splitters"; inherit version; - hash = "sha256-rEWfqYeZ9RF61UJakzCyGWEyHjC8GaKi+fdh3a3WKqE="; + hash = "sha256-rIkn3AugjrpwL2lhye19986tjeGan3EBqyteo0IBs8E="; }; nativeBuildInputs = [ From 5ea69eeef450edeee66f24fcb3942ad6a46cbd16 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 May 2024 10:11:59 +0200 Subject: [PATCH 085/111] python312Packages.langchain-text-splitters: refactor --- .../python-modules/langchain-text-splitters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index f8eaf117e3a9..18de1949ddf2 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { hash = "sha256-rIkn3AugjrpwL2lhye19986tjeGan3EBqyteo0IBs8E="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ langchain-core lxml ]; From e3d12429927ea96a0cbad46d205d0d965f42efff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 May 2024 10:12:14 +0200 Subject: [PATCH 086/111] python312Packages.langchain-text-splitters: format with nixfmt --- .../langchain-text-splitters/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index 18de1949ddf2..3f8fa837af7a 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, fetchPypi -, poetry-core -, langchain-core -, lxml -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + langchain-core, + lxml, + pythonOlder, }: buildPythonPackage rec { @@ -20,9 +21,7 @@ buildPythonPackage rec { hash = "sha256-rIkn3AugjrpwL2lhye19986tjeGan3EBqyteo0IBs8E="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ langchain-core @@ -32,9 +31,7 @@ buildPythonPackage rec { # PyPI source does not have tests doCheck = false; - pythonImportsCheck = [ - "langchain_text_splitters" - ]; + pythonImportsCheck = [ "langchain_text_splitters" ]; meta = with lib; { description = "Build context-aware reasoning applications"; From c41b68a4d81f4c81a81167f98e1f61899f3c275c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 May 2024 10:12:41 +0200 Subject: [PATCH 087/111] python312Packages.langsmith: 0.1.57 -> 0.1.59 Diff: https://github.com/langchain-ai/langsmith-sdk/compare/refs/tags/v0.1.57...v0.1.59 Changelog: https://github.com/langchain-ai/langsmith-sdk/releases/tag/v0.1.59 --- pkgs/development/python-modules/langsmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index fe26d306a398..4e7bc1d107f3 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.57"; + version = "0.1.59"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-L725AfkmBEe44LkJ0y6PdDvbnbCf31LXL3YdnOshnqE="; + hash = "sha256-k9WsJUiJPCahwUHzsOblBCm58z2dHQZGk3U6GMm7SpQ="; }; sourceRoot = "${src.name}/python"; From a511a273a9229c154ba0647d9dc8eb2ab5f39ae7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 May 2024 10:22:17 +0200 Subject: [PATCH 088/111] python312Packages.pgspecial: refactor --- .../python-modules/pgspecial/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 21408918e06a..7655968a7c38 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -1,24 +1,32 @@ { lib , buildPythonPackage -, fetchPypi -, pytestCheckHook -, psycopg , click , configobj +, fetchPypi +, psycopg +, pytestCheckHook +, pythonOlder +, setuptools , sqlparse }: buildPythonPackage rec { pname = "pgspecial"; version = "2.1.2"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-8EGeGzt4+zpy/jtUb2eIpxIJFTLVmf51k7X27lWoj4c="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ click sqlparse psycopg @@ -30,13 +38,14 @@ buildPythonPackage rec { ]; disabledTests = [ - # requires a postgresql server + # Test requires a Postgresql server "test_slash_dp_pattern_schema" ]; meta = with lib; { description = "Meta-commands handler for Postgres Database"; homepage = "https://github.com/dbcli/pgspecial"; + changelog = "https://github.com/dbcli/pgspecial/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; From 141409fa5dab620d6ea004875e622b2eb5729c58 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 May 2024 10:22:32 +0200 Subject: [PATCH 089/111] python312Packages.pgspecial: format with nixfmt --- .../python-modules/pgspecial/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 7655968a7c38..6ce163dd74c4 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, click -, configobj -, fetchPypi -, psycopg -, pytestCheckHook -, pythonOlder -, setuptools -, sqlparse +{ + lib, + buildPythonPackage, + click, + configobj, + fetchPypi, + psycopg, + pytestCheckHook, + pythonOlder, + setuptools, + sqlparse, }: buildPythonPackage rec { @@ -22,9 +23,7 @@ buildPythonPackage rec { hash = "sha256-8EGeGzt4+zpy/jtUb2eIpxIJFTLVmf51k7X27lWoj4c="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ click From 537ab77e8856f084c2991464bbca558566864781 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 16 May 2024 10:46:05 +0200 Subject: [PATCH 090/111] lektor: fix hash on darwin --- pkgs/tools/misc/lektor/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/lektor/default.nix b/pkgs/tools/misc/lektor/default.nix index be92bc2723fb..129e5e41851c 100644 --- a/pkgs/tools/misc/lektor/default.nix +++ b/pkgs/tools/misc/lektor/default.nix @@ -30,7 +30,11 @@ python.pkgs.buildPythonApplication rec { owner = "lektor"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-USwHSUXpk4XM5ySTXnYc5FqqkTaf8PoxQTeRnWOvbxk="; + # fix for case-insensitive filesystems + postFetch = '' + rm -f $out/tests/demo-project/content/icc-profile-test/{LICENSE,license}.txt + ''; + hash = "sha256-y0/fYuiIB/O5tsYKjzOPnCafOIZCn4Z5OITPMcnHd/M="; }; npmDeps = fetchNpmDeps { From e577e1f7c862611e974e4bece5368922302b061c Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Sun, 5 May 2024 11:16:27 +0200 Subject: [PATCH 091/111] python3Packages.pypng: 0.0.21 -> 0.20220715.0 The source was moved to GitLab and the naming scheme also changed --- pkgs/development/python-modules/pypng/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pypng/default.nix b/pkgs/development/python-modules/pypng/default.nix index c79ec4f92a0e..ca47266e9dfc 100644 --- a/pkgs/development/python-modules/pypng/default.nix +++ b/pkgs/development/python-modules/pypng/default.nix @@ -1,20 +1,20 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchFromGitLab , pytestCheckHook , setuptools }: buildPythonPackage rec { pname = "pypng"; - version = "0.0.21"; - format = "pyproject"; + version = "0.20220715.0"; + pyproject = true; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "drj11"; repo = "pypng"; rev = "refs/tags/${pname}-${version}"; - hash = "sha256-JU1GCSTm2s6Kczn6aRcF5DizPJVpizNtnAMJxTBi9vo="; + hash = "sha256-tTnsGCAmHexDWm/T5xpHpcBaQcBEqMfTFaoOAeC+pDs="; }; nativeBuildInputs = [ From da68f358bc114a337af38b1789779a066299137a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Thu, 16 May 2024 11:48:32 +0200 Subject: [PATCH 092/111] treewide: Remove usage of pkgs.{system,hostPlatform} aliases These aliases should not be used inside nixpkgs and are only there for backward compatibility. --- nixos/modules/system/boot/binfmt.nix | 2 +- nixos/modules/virtualisation/lxc-image-metadata.nix | 4 ++-- nixos/modules/virtualisation/qemu-vm.nix | 2 +- nixos/tests/stub-ld.nix | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index 572bfeda7a8f..1d702442f7f6 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -280,7 +280,7 @@ in { }; config = { - boot.binfmt.registrations = builtins.listToAttrs (map (system: assert system != pkgs.system; { + boot.binfmt.registrations = builtins.listToAttrs (map (system: assert system != pkgs.stdenv.hostPlatform.system; { name = system; value = { config, ... }: let interpreter = getEmulator system; diff --git a/nixos/modules/virtualisation/lxc-image-metadata.nix b/nixos/modules/virtualisation/lxc-image-metadata.nix index 2c0568b4c468..38d955798f3e 100644 --- a/nixos/modules/virtualisation/lxc-image-metadata.nix +++ b/nixos/modules/virtualisation/lxc-image-metadata.nix @@ -87,10 +87,10 @@ in { contents = [ { source = toYAML "metadata.yaml" { - architecture = builtins.elemAt (builtins.match "^([a-z0-9_]+).+" (toString pkgs.system)) 0; + architecture = builtins.elemAt (builtins.match "^([a-z0-9_]+).+" (toString pkgs.stdenv.hostPlatform.system)) 0; creation_date = 1; properties = { - description = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} ${pkgs.system}"; + description = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} ${pkgs.stdenv.hostPlatform.system}"; os = "${config.system.nixos.distroId}"; release = "${config.system.nixos.codeName}"; }; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index c30f4577fdd8..3b81cfaf2b8c 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -912,7 +912,7 @@ in "ppc64-linux" = "tpm-spapr"; "armv7-linux" = "tpm-tis-device"; "aarch64-linux" = "tpm-tis-device"; - }.${pkgs.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU")); + }.${pkgs.stdenv.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU")); defaultText = '' Based on the guest platform Linux system: diff --git a/nixos/tests/stub-ld.nix b/nixos/tests/stub-ld.nix index 25161301741b..72b0aebf3e6c 100644 --- a/nixos/tests/stub-ld.nix +++ b/nixos/tests/stub-ld.nix @@ -45,10 +45,10 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { ${if32 "machine.succeed('test -L /${libDir32}/${ldsoBasename32}')"} with subtest("Try FHS executable"): - machine.copy_from_host('${test-exec.${pkgs.system}}','test-exec') + machine.copy_from_host('${test-exec.${pkgs.stdenv.hostPlatform.system}}','test-exec') machine.succeed('if test-exec/${exec-name} 2>outfile; then false; else [ $? -eq 127 ];fi') machine.succeed('grep -qi nixos outfile') - ${if32 "machine.copy_from_host('${test-exec.${pkgs32.system}}','test-exec32')"} + ${if32 "machine.copy_from_host('${test-exec.${pkgs32.stdenv.hostPlatform.system}}','test-exec32')"} ${if32 "machine.succeed('if test-exec32/${exec-name} 2>outfile32; then false; else [ $? -eq 127 ];fi')"} ${if32 "machine.succeed('grep -qi nixos outfile32')"} From 1801fa8d7e7a010e2e4b5386db16b452757d643c Mon Sep 17 00:00:00 2001 From: Burgess Chang Date: Fri, 10 May 2024 09:02:43 +0800 Subject: [PATCH 093/111] maintainers: add brsvh Signed-off-by: Burgess Chang --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 824866dd397a..87865fe09bc8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2986,6 +2986,14 @@ githubId = 184563; name = "Bruno Paz"; }; + brsvh = { + email = "bsc@brsvh.org"; + github = "brsvh"; + githubId = 63050399; + keys = [ { fingerprint = "7B74 0DB9 F2AC 6D3B 226B C530 78D7 4502 D92E 0218"; } ]; + matrix = "@brsvh:mozilla.org"; + name = "Burgess Chang"; + }; bryanasdev000 = { email = "bryanasdev000@gmail.com"; matrix = "@bryanasdev000:matrix.org"; From 97d44a22029acf8e111ff28035a837523d07f027 Mon Sep 17 00:00:00 2001 From: Burgess Chang Date: Fri, 10 May 2024 09:08:17 +0800 Subject: [PATCH 094/111] parinfer-rust-emacs: init at 0.4.6 Signed-off-by: Burgess Chang --- .../pa/parinfer-rust-emacs/package.nix | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/pa/parinfer-rust-emacs/package.nix diff --git a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix new file mode 100644 index 000000000000..ec1c89edb343 --- /dev/null +++ b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix @@ -0,0 +1,27 @@ +{ + fetchFromGitHub, + lib, + llvmPackages, + rustPlatform, +}: +rustPlatform.buildRustPackage rec { + pname = "parinfer-rust-emacs"; + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "justinbarclay"; + repo = "parinfer-rust-emacs"; + rev = "v${version}"; + hash = "sha256-SNs/75beomxvexfE4+3v/l9Xl5w5SY0EWcORHvRitOw="; + }; + + cargoHash = "sha256-LmfcY9iR7BGh3dF/raSZTIwburtaQRI3I3XvOZG343M="; + + meta = with lib; { + description = "An emacs centric fork of parinfer-rust"; + mainProgram = "parinfer-rust"; + homepage = "https://github.com/justinbarclay/parinfer-rust-emacs"; + license = licenses.isc; + maintainers = with maintainers; [ brsvh ]; + }; +} From 083f211783cad8ac7463e5a395dac4aceedf193a Mon Sep 17 00:00:00 2001 From: nhnn Date: Sat, 20 Apr 2024 09:42:56 +0300 Subject: [PATCH 095/111] pkgs: add PHP to formats.nix --- .../development/settings-options.section.md | 21 ++++++ pkgs/pkgs-lib/formats.nix | 2 + pkgs/pkgs-lib/formats/php/default.nix | 69 +++++++++++++++++++ pkgs/pkgs-lib/tests/formats.nix | 44 ++++++++++++ 4 files changed, 136 insertions(+) create mode 100644 pkgs/pkgs-lib/formats/php/default.nix diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index 806eee563790..cedc82d32f89 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -146,6 +146,27 @@ have a predefined type and string generator already declared under : Outputs the given attribute set as an Elixir map, instead of the default Elixir keyword list +`pkgs.formats.php { finalVariable }` []{#pkgs-formats-php} + +: A function taking an attribute set with values + + `finalVariable` + + : The variable that will store generated expression (usually `config`). If set to `null`, generated expression will contain `return`. + + It returns a set with PHP-Config-specific attributes `type`, `lib`, and + `generate` as specified [below](#pkgs-formats-result). + + The `lib` attribute contains functions to be used in settings, for + generating special PHP values: + + `mkRaw phpCode` + + : Outputs the given string as raw PHP code + + `mkMixedArray list set` + + : Creates PHP array that contains both indexed and associative values. For example, `lib.mkMixedArray [ "hello" "world" ] { "nix" = "is-great"; }` returns `['hello', 'world', 'nix' => 'is-great']` []{#pkgs-formats-result} These functions all return an attribute set with these values: diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 1b72270b43ca..7cc0bf4f4e50 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -43,6 +43,8 @@ rec { hocon = (import ./formats/hocon/default.nix { inherit lib pkgs; }).format; + php = (import ./formats/php/default.nix { inherit lib pkgs; }).format; + json = {}: { type = with lib.types; let diff --git a/pkgs/pkgs-lib/formats/php/default.nix b/pkgs/pkgs-lib/formats/php/default.nix new file mode 100644 index 000000000000..9bd1de958d0b --- /dev/null +++ b/pkgs/pkgs-lib/formats/php/default.nix @@ -0,0 +1,69 @@ +{pkgs, lib}: { + # Format for defining configuration of some PHP services, that use "include 'config.php';" approach. + format = {finalVariable ? null}: let + toPHP = value: { + "null" = "null"; + "bool" = if value then "true" else "false"; + "int" = toString value; + "float" = toString value; + "string" = string value; + "set" = attrs value; + "list" = list value; + } + .${builtins.typeOf value} or + (abort "should never happen: unknown value type ${builtins.typeOf value}"); + + # https://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single + escapeSingleQuotedString = lib.escape [ "'" "\\" ]; + string = value: "'${escapeSingleQuotedString value}'"; + + listContent = values: lib.concatStringsSep ", " (map toPHP values); + list = values: "[" + (listContent values) + "]"; + + attrsContent = values: lib.pipe values [ + (lib.mapAttrsToList (k: v: "${toPHP k} => ${toPHP v}")) + (lib.concatStringsSep ", ") + ]; + attrs = set: + if set ? _phpType then specialType set + else + "[" + attrsContent set + "]"; + + mixedArray = {list, set}: if list == [] then attrs set else "[${listContent list}, ${attrsContent set}]"; + + specialType = {value, _phpType}: { + "mixed_array" = mixedArray value; + "raw" = value; + }.${_phpType}; + + type = with lib.types; + nullOr (oneOf [ + bool + int + float + str + (attrsOf type) + (listOf type) + ]) + // { + description = "PHP value"; + }; + in { + + inherit type; + + lib = { + mkMixedArray = list: set: {_phpType = "mixed_array"; value = { inherit list set;}; }; + mkRaw = raw: {_phpType = "raw"; value = raw;}; + }; + + generate = name: value: pkgs.writeTextFile { + inherit name; + text = let + # strict_types enabled here to easily debug problems when calling functions of incorrect type using `mkRaw`. + phpHeader = " ['foo' => null], 'false' => false, 'float' => 3.141000, 'int' => 10, 'list' => [null, null], 'mixed' => [10, 3.141000, 'attrs' => ['foo' => null], 'str' => 'foo'], 'null' => null, 'raw' => random_function(), 'str' => 'foo', 'str_special' => 'foo + testhello\'\'\'${"'"}, 'true' => true]; + ''; + }; + + phpReturn = shouldPass { + format = formats.php { }; + input = { + int = 10; + float = 3.141; + str = "foo"; + str_special = "foo\ntesthello'''"; + attrs.foo = null; + }; + expected = '' + ['foo' => null], 'float' => 3.141000, 'int' => 10, 'str' => 'foo', 'str_special' => 'foo + testhello\'\'\'${"'"}]; + ''; + }; + } From 509070d0a7d3523dcae44b43f021611616a8d00e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 May 2024 10:32:04 +0000 Subject: [PATCH 096/111] python311Packages.cnvkit: 0.9.10 -> 0.9.11 --- pkgs/development/python-modules/cnvkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix index 35195b1db529..f705cfbeff9f 100644 --- a/pkgs/development/python-modules/cnvkit/default.nix +++ b/pkgs/development/python-modules/cnvkit/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "cnvkit"; - version = "0.9.10"; + version = "0.9.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "etal"; repo = "cnvkit"; rev = "refs/tags/v${version}"; - hash = "sha256-mCQXo3abwC06x/g51UBshqUk3dpqEVNUvx+cJ/EdYGQ="; + hash = "sha256-tlR1LsR+M1nkzk3CgrkkNcSGP3juv25GXddWDDWJ5ao="; }; postPatch = '' From ac2182f47163d8e3a08431e5e6d897d15a993d67 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Thu, 16 May 2024 18:49:45 +0800 Subject: [PATCH 097/111] gnuradio: fix missing typelib Fix the following launch failure: ImportError Failed to initialize GTK. If you are running over ssh, did you enable X forwarding and start ssh with -X? (Typelib file for namespace 'GObject', version '2.0' not found) --- pkgs/applications/radio/gnuradio/wrapper.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 9ec00058f1b8..f468aadb27b5 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -95,6 +95,7 @@ let "--prefix" "XDG_DATA_DIRS" ":" "${unwrapped.gtk}/share" "--prefix" "XDG_DATA_DIRS" ":" "${unwrapped.gtk}/share/gsettings-schemas/${unwrapped.gtk.name}" "--prefix" "GI_TYPELIB_PATH" ":" "${lib.makeSearchPath "lib/girepository-1.0" [ + (lib.getLib glib) unwrapped.gtk gsettings-desktop-schemas atk From 817f2884aa29aaa3c8203615b44fff8f5ea5aa79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 May 2024 11:09:16 +0000 Subject: [PATCH 098/111] python311Packages.gcal-sync: 6.0.4 -> 6.1.0 --- pkgs/development/python-modules/gcal-sync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index 7a2ce7e51197..59914e233582 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "6.0.4"; + version = "6.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-ufoe9+4zhlixcSGMAhuhJx2Y2vrN036N8UvyP3xuTRQ="; + hash = "sha256-mZn/3oROIUSv6cCxXs3rBJtlmKsqNflTW2pcER8GisE="; }; nativeBuildInputs = [ From 5628b761de256e12bec4a92454a39844d3842228 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 May 2024 11:48:39 +0000 Subject: [PATCH 099/111] qlog: 0.35.0 -> 0.35.1 --- pkgs/applications/radio/qlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index 02e6d4c1625a..e89b1014e528 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.35.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-f+H1NglsNhUTbH0JOWmvERrEQEwDAIRkJCD4ELC4oA8="; + hash = "sha256-qmTep8cwNFxgvWO6tOtk+kwjhEltjJTc0Fo4o01GzIo="; fetchSubmodules = true; }; From 749942952f45215bd08745b84924faa9d9e642de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 May 2024 11:50:37 +0000 Subject: [PATCH 100/111] python311Packages.pygount: 1.6.1 -> 1.8.0 --- pkgs/development/python-modules/pygount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygount/default.nix b/pkgs/development/python-modules/pygount/default.nix index 4b1236428836..36c0ae86304b 100644 --- a/pkgs/development/python-modules/pygount/default.nix +++ b/pkgs/development/python-modules/pygount/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pygount"; - version = "1.6.1"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "roskakori"; repo = "pygount"; rev = "refs/tags/v${version}"; - hash = "sha256-j+mXIyF/54MCm0yv7Z+ymy/EeZz7iS/a+/5I9lo1+Zo="; + hash = "sha256-PFqcSnJoGL4bXFy3hu3Iurbb8QK1NqCDs8aJmMxP4Hc="; }; nativeBuildInputs = [ From e704b9419197844adba884d701b99958e3bb07ec Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 16 May 2024 19:53:25 +0800 Subject: [PATCH 101/111] nixos/atop: fix mkSystemd --- nixos/modules/programs/atop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix index be82e432474b..3738f926ca3d 100644 --- a/nixos/modules/programs/atop.nix +++ b/nixos/modules/programs/atop.nix @@ -120,8 +120,8 @@ in wantedBy = [ (if type == "services" then "multi-user.target" else if type == "timers" then "timers.target" else null) ]; }; }; - mkService = lib.mkSystemd "services"; - mkTimer = lib.mkSystemd "timers"; + mkService = mkSystemd "services"; + mkTimer = mkSystemd "timers"; in { packages = [ atop (lib.mkIf cfg.netatop.enable cfg.netatop.package) ]; From e4ee77feb0b3e43f528f9e1724bd4d7a4ef1bfc0 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Wed, 24 Jan 2024 11:08:33 +0100 Subject: [PATCH 102/111] pkgsStatic: Pass hostPlatform.gcc attribute To build the security wrappers[1] the pkgsStatic stdenv is used, so the binaries are static. However, the hostPlatform may have gcc attributes that are *required* to build binaries so they can run on the host platform. In particular, this is the case when using gcc.arch, which ends up injecting -march=... in the gcc wrapper. Those attributes are not contained in hostPlatform.parsed. This change sets the same gcc attributes found in the hostPlatform for the pkgsStatic cross system, so it can build binaries with the same gcc flags. [1]: nixos/modules/security/wrappers/default.nix --- pkgs/top-level/stage.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 1cc05167cee8..af43da0ca26d 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -272,8 +272,8 @@ let if stdenv.isLinux then makeMuslParsedPlatform stdenv.hostPlatform.parsed else stdenv.hostPlatform.parsed; - } // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { - gcc.abi = "elfv2"; + gcc = lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { abi = "elfv2"; } // + stdenv.hostPlatform.gcc or {}; }; }); }; From 9391d89e8077caddcf29e756dc60d5e2c7553ba2 Mon Sep 17 00:00:00 2001 From: Nanotwerp Date: Wed, 15 May 2024 16:12:05 -0400 Subject: [PATCH 103/111] llvmPackages_latest: llvmPackages_17 -> llvmPackages_18 --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 72c54eed2e20..6ab0f3753eb1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1412,7 +1412,7 @@ mapAliases ({ inherit (stdenv) buildPlatform hostPlatform targetPlatform; # Added 2023-01-09 # LLVM packages for (integration) testing that should not be used inside Nixpkgs: - llvmPackages_latest = llvmPackages_17; + llvmPackages_latest = llvmPackages_18; llvmPackages_git = recurseIntoAttrs (callPackage ../development/compilers/llvm/git { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_git.tools; From 5eb9918ba493c6a7a09e82650edc870294e5369b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 May 2024 12:38:02 +0000 Subject: [PATCH 104/111] crowdin-cli: 3.19.3 -> 3.19.4 --- pkgs/tools/text/crowdin-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index 22a199680492..763c2e3b0fbe 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.19.3"; + version = "3.19.4"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - hash = "sha256-9SghBr+vyXrzB+zq+J0hRMVIom4mb4x0xBSqS4EqhVM="; + hash = "sha256-SD4D9wW+Tdr3mD91SJKm5K3gktH0ywQBRh0d1TMeLDs="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; From 489d8c1c575c1840293e0770999cd2076aefe2d1 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 16 May 2024 05:57:02 -0700 Subject: [PATCH 105/111] fooyin: init at 0.4.1 (#311879) * fooyin: init at 0.4.2 --- pkgs/by-name/fo/fooyin/package.nix | 61 ++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 pkgs/by-name/fo/fooyin/package.nix diff --git a/pkgs/by-name/fo/fooyin/package.nix b/pkgs/by-name/fo/fooyin/package.nix new file mode 100644 index 000000000000..afa5bf4047c6 --- /dev/null +++ b/pkgs/by-name/fo/fooyin/package.nix @@ -0,0 +1,61 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, alsa-lib +, ffmpeg +, kdePackages +, kdsingleapplication +, openssl +, pipewire +, taglib +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fooyin"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "ludouzi"; + repo = "fooyin"; + rev = "v" + finalAttrs.version; + hash = "sha256-1U7eqXVcp0lO/X92oNQ3mWdozgJ1eroQPojscSWH6+I="; + }; + + buildInputs = [ + alsa-lib + ffmpeg + kdsingleapplication + pipewire + kdePackages.qcoro + kdePackages.qtbase + kdePackages.qtsvg + taglib + ]; + + nativeBuildInputs = [ + cmake + pkg-config + kdePackages.qttools + kdePackages.wrapQtAppsHook + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_TESTING" (finalAttrs.doCheck or false)) + # we need INSTALL_FHS to be true as the various artifacts are otherwise just dumped in the root + # of $out and the fixupPhase cleans things up anyway + (lib.cmakeBool "INSTALL_FHS" true) + ]; + + env.LANG = "C.UTF-8"; + + meta = with lib; { + description = "A customisable music player"; + mainProgram = "fooyin"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; + }; +}) From c405d3e066b95d3b4d6e46e88d5dde89f171fbea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 May 2024 13:06:29 +0000 Subject: [PATCH 106/111] flashmq: 1.9.1 -> 1.13.0 --- pkgs/servers/mqtt/flashmq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mqtt/flashmq/default.nix b/pkgs/servers/mqtt/flashmq/default.nix index 8a579d948881..1b243197b8b5 100644 --- a/pkgs/servers/mqtt/flashmq/default.nix +++ b/pkgs/servers/mqtt/flashmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.9.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-LxmD/NfD4OJR77erwRnHoe6VRiytqzMlWvRtgY8RD94="; + hash = "sha256-MoBLV39auDz5oicpX6CVvrHMifGpUozocq4E3J+8xWA="; }; nativeBuildInputs = [ cmake installShellFiles ]; From b8ef7d38749f76ce0b8fe9e6f0d0493eeba1449a Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Tue, 14 May 2024 17:51:01 +0000 Subject: [PATCH 107/111] scion: 0.10.0 -> 0.11.0 Includes removal of TestOpensslCompatible skipTest, skipTest function, and patch upstreamed in 0.11.0 --- pkgs/by-name/sc/scion/package.nix | 32 +++---------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix index 67321aaa01ff..9044dc44f2a5 100644 --- a/pkgs/by-name/sc/scion/package.nix +++ b/pkgs/by-name/sc/scion/package.nix @@ -5,19 +5,7 @@ , nixosTests }: let - version = "0.10.0"; - - # Injects a `t.Skip()` into a given test since there's apparently no other way to skip tests here. - # ref: https://github.com/NixOS/nixpkgs/blob/047bc33866bf7004d0ce9ed0af78dab5ceddaab0/pkgs/by-name/vi/vikunja/package.nix#L96 - skipTest = lineOffset: testCase: file: - let - jumpAndAppend = lib.concatStringsSep ";" (lib.replicate (lineOffset - 1) "n" ++ [ "a" ]); - in - '' - sed -i -e '/${testCase}/{ - ${jumpAndAppend} t.Skip(); - }' ${file} - ''; + version = "0.11.0"; in buildGoModule { @@ -29,20 +17,13 @@ buildGoModule { owner = "scionproto"; repo = "scion"; rev = "v${version}"; - hash = "sha256-8yXjEDo1k0+7O0gx2acAZMrG/r+iePfNCG+FolCSKwI="; + hash = "sha256-JemqSr1XBwW1hLuWQrApY/hqLj/VpW3xSJedVIoFSiY="; }; - vendorHash = "sha256-4nTp6vOyS7qDn8HmNO0NGCNU7wCb8ww8a15Yv3MPEq8="; + vendorHash = "sha256-akFbHgo8xI2/4aQsyutjhXPM5d0A3se3kG/6Ebw1Qcs="; excludedPackages = [ "acceptance" "demo" "tools" "pkg/private/xtest/graphupdater" ]; - # This can be removed in the next release of scion since its fixed upstream - # https://github.com/scionproto/scion/pull/4476 - postConfigure = '' - # This test needs docker, so lets skip it - ${skipTest 1 "TestOpensslCompatible" "scion-pki/trcs/sign_test.go"} - ''; - postInstall = '' set +e mv $out/bin/gateway $out/bin/scion-ip-gateway @@ -55,13 +36,6 @@ buildGoModule { doCheck = true; - patches = [ - (fetchpatch2 { - url = "https://github.com/scionproto/scion/commit/cb7fa6d6aab55c9eb90556c2b996b87539f8aa02.patch"; - hash = "sha256-mMGJMPB6T7KeDXjEXffdrhzyKwaFmhuisK6PjHOJIdU="; - }) - ]; - passthru.tests = { inherit (nixosTests) scion-freestanding-deployment; }; From 0801041b528ff00c2a7bfbf309eb752362df344c Mon Sep 17 00:00:00 2001 From: Coutinho de Souza Date: Fri, 10 May 2024 16:37:28 -0300 Subject: [PATCH 108/111] hare: remove shell wrapping overhead Hardcode qbe and harec to avoid the overhead of wrapping hare with a bash script. By doing that, we also had to change how `makeFlags` were defined: Now only part of the `_` make variables are conditioned to the enableCrossCompilation. The ones belonging to the build platform are passed unconditionally. Add qbe and harec to propagatedBuildInputs. Some build frameworks may rely on having harec and qbe available on PATH by setting `HAREC` and `QBE` to relative paths --- e. g., `haredo`. --- .../ha/hare/003-hardcode-qbe-and-harec.patch | 24 ++++ pkgs/by-name/ha/hare/package.nix | 114 +++++++++--------- 2 files changed, 79 insertions(+), 59 deletions(-) create mode 100644 pkgs/by-name/ha/hare/003-hardcode-qbe-and-harec.patch diff --git a/pkgs/by-name/ha/hare/003-hardcode-qbe-and-harec.patch b/pkgs/by-name/ha/hare/003-hardcode-qbe-and-harec.patch new file mode 100644 index 000000000000..808d75aeb185 --- /dev/null +++ b/pkgs/by-name/ha/hare/003-hardcode-qbe-and-harec.patch @@ -0,0 +1,24 @@ +diff --git a/cmd/hare/build.ha b/cmd/hare/build.ha +index b2ac6518..417b46c6 100644 +--- a/cmd/hare/build.ha ++++ b/cmd/hare/build.ha +@@ -37,7 +37,7 @@ fn build(name: str, cmd: *getopt::command) (void | error) = { + case let ncpu: size => + yield ncpu; + }, +- version = build::get_version(os::tryenv("HAREC", "harec"))?, ++ version = build::get_version(os::tryenv("HAREC", "@harec@"))?, + arch = arch.qbe_name, + platform = build::get_platform(os::sysname())?, + ... +@@ -145,8 +145,8 @@ fn build(name: str, cmd: *getopt::command) (void | error) = { + set_arch_tags(&ctx.ctx.tags, arch); + + ctx.cmds = ["", +- os::tryenv("HAREC", "harec"), +- os::tryenv("QBE", "qbe"), ++ os::tryenv("HAREC", "@harec@"), ++ os::tryenv("QBE", "@qbe@"), + os::tryenv("AS", arch.as_cmd), + os::tryenv("LD", arch.ld_cmd), + ]; diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix index a798cc46819c..3cf37e33109b 100644 --- a/pkgs/by-name/ha/hare/package.nix +++ b/pkgs/by-name/ha/hare/package.nix @@ -2,9 +2,7 @@ lib, stdenv, fetchFromSourcehut, - binutils-unwrapped, harec, - makeWrapper, qbe, gitUpdater, scdoc, @@ -34,7 +32,9 @@ assert ''; let + buildArch = stdenv.buildPlatform.uname.processor; arch = stdenv.hostPlatform.uname.processor; + platform = lib.toLower stdenv.hostPlatform.uname.system; qbePlatform = { x86_64 = "amd64_sysv"; @@ -42,32 +42,38 @@ let riscv64 = "rv64"; } .${arch}; - platform = lib.toLower stdenv.hostPlatform.uname.system; embeddedOnBinaryTools = let - genToolsFromToolchain = + genPaths = toolchain: let - crossTargetPrefix = toolchain.stdenv.cc.targetPrefix; - toolchainArch = toolchain.stdenv.hostPlatform.uname.processor; - absOrRelPath = - toolDrv: toolBasename: - if arch == toolchainArch then - toolBasename - else - lib.getExe' toolDrv "${crossTargetPrefix}${toolBasename}"; + inherit (toolchain.stdenv.cc) targetPrefix; + inherit (toolchain.stdenv.targetPlatform.uname) processor; in { - "ld" = absOrRelPath toolchain.buildPackages.binutils "ld"; - "as" = absOrRelPath toolchain.buildPackages.binutils "as"; - "cc" = absOrRelPath toolchain.stdenv.cc "cc"; + "${processor}" = { + "ld" = lib.getExe' toolchain.buildPackages.binutils "${targetPrefix}ld"; + "as" = lib.getExe' toolchain.buildPackages.binutils "${targetPrefix}as"; + "cc" = lib.getExe' toolchain.stdenv.cc "${targetPrefix}cc"; + }; }; in - { - x86_64 = genToolsFromToolchain x86_64PkgsCrossToolchain; - aarch64 = genToolsFromToolchain aarch64PkgsCrossToolchain; - riscv64 = genToolsFromToolchain riscv64PkgsCrossToolchain; - }; + builtins.foldl' (acc: elem: acc // (genPaths elem)) { } [ + x86_64PkgsCrossToolchain + aarch64PkgsCrossToolchain + riscv64PkgsCrossToolchain + ]; + crossCompMakeFlags = builtins.filter (x: !(lib.hasPrefix (lib.toUpper buildArch) x)) [ + "RISCV64_AS=${embeddedOnBinaryTools.riscv64.as}" + "RISCV64_CC=${embeddedOnBinaryTools.riscv64.cc}" + "RISCV64_LD=${embeddedOnBinaryTools.riscv64.ld}" + "AARCH64_AS=${embeddedOnBinaryTools.aarch64.as}" + "AARCH64_CC=${embeddedOnBinaryTools.aarch64.cc}" + "AARCH64_LD=${embeddedOnBinaryTools.aarch64.ld}" + "X86_64_AS=${embeddedOnBinaryTools.x86_64.as}" + "X86_64_CC=${embeddedOnBinaryTools.x86_64.cc}" + "X86_64_LD=${embeddedOnBinaryTools.x86_64.ld}" + ]; in stdenv.mkDerivation (finalAttrs: { pname = "hare"; @@ -99,6 +105,12 @@ stdenv.mkDerivation (finalAttrs: { # Don't build haredoc since it uses the build `hare` bin, which breaks # cross-compilation. ./002-dont-build-haredoc.patch + # Hardcode harec and qbe. + (substituteAll { + src = ./003-hardcode-qbe-and-harec.patch; + harec = lib.getExe harec; + qbe = lib.getExe qbe; + }) # Display toolchains when using `hare version -v`. (fetchpatch { url = "https://git.sr.ht/~sircmpwn/hare/commit/e35f2284774436f422e06f0e8d290b173ced1677.patch"; @@ -108,42 +120,37 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ harec - makeWrapper qbe scdoc ]; - buildInputs = [ - binutils-unwrapped + # Needed for build frameworks like `haredo`, which set the HAREC and QBE env vars to `harec` and + # `qbe` respectively. + propagatedBuildInputs = [ harec qbe - tzdata ]; - makeFlags = - [ - "HARECACHE=.harecache" - "PREFIX=${builtins.placeholder "out"}" - "ARCH=${arch}" - "VERSION=${finalAttrs.version}-nixpkgs" - "QBEFLAGS=-t${qbePlatform}" - "AS=${stdenv.cc.targetPrefix}as" - "LD=${stdenv.cc.targetPrefix}ld" - # Strip the variable of an empty $(SRCDIR)/hare/third-party, since nix does - # not follow the FHS. - "HAREPATH=$(SRCDIR)/hare/stdlib" - ] - ++ lib.optionals enableCrossCompilation [ - "RISCV64_AS=${embeddedOnBinaryTools.riscv64.as}" - "RISCV64_CC=${embeddedOnBinaryTools.riscv64.cc}" - "RISCV64_LD=${embeddedOnBinaryTools.riscv64.ld}" - "AARCH64_AS=${embeddedOnBinaryTools.aarch64.as}" - "AARCH64_CC=${embeddedOnBinaryTools.aarch64.cc}" - "AARCH64_LD=${embeddedOnBinaryTools.aarch64.ld}" - "X86_64_AS=${embeddedOnBinaryTools.x86_64.as}" - "X86_64_CC=${embeddedOnBinaryTools.x86_64.cc}" - "X86_64_LD=${embeddedOnBinaryTools.x86_64.ld}" - ]; + buildInputs = [ + harec + qbe + ]; + + makeFlags = [ + "HARECACHE=.harecache" + "PREFIX=${builtins.placeholder "out"}" + "ARCH=${arch}" + "VERSION=${finalAttrs.version}-nixpkgs" + "QBEFLAGS=-t${qbePlatform}" + "AS=${stdenv.cc.targetPrefix}as" + "LD=${stdenv.cc.targetPrefix}ld" + "${lib.toUpper buildArch}_AS=${embeddedOnBinaryTools.${buildArch}.as}" + "${lib.toUpper buildArch}_CC=${embeddedOnBinaryTools.${buildArch}.cc}" + "${lib.toUpper buildArch}_LD=${embeddedOnBinaryTools.${buildArch}.ld}" + # Strip the variable of an empty $(SRCDIR)/hare/third-party, since nix does + # not follow the FHS. + "HAREPATH=$(SRCDIR)/hare/stdlib" + ] ++ lib.optionals enableCrossCompilation crossCompMakeFlags; enableParallelBuilding = true; @@ -158,17 +165,6 @@ stdenv.mkDerivation (finalAttrs: { ln -s configs/${platform}.mk config.mk ''; - postFixup = '' - wrapProgram $out/bin/hare \ - --prefix PATH : ${ - lib.makeBinPath [ - binutils-unwrapped - harec - qbe - ] - } - ''; - setupHook = ./setup-hook.sh; passthru = { From a0dcd95afee2d56d30053551fc176739e52927c8 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 16 May 2024 17:31:06 +0400 Subject: [PATCH 109/111] flashmq: migrate to by-name --- .../mqtt/flashmq/default.nix => by-name/fl/flashmq/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/mqtt/flashmq/default.nix => by-name/fl/flashmq/package.nix} (100%) diff --git a/pkgs/servers/mqtt/flashmq/default.nix b/pkgs/by-name/fl/flashmq/package.nix similarity index 100% rename from pkgs/servers/mqtt/flashmq/default.nix rename to pkgs/by-name/fl/flashmq/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0af455d8fef..345452066cb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25668,8 +25668,6 @@ with pkgs; inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5 firebird; - flashmq = callPackage ../servers/mqtt/flashmq { }; - freeradius = callPackage ../servers/freeradius { }; freshrss = callPackage ../servers/web-apps/freshrss { }; From 3e38aff7f8986da47121a215cddb4de26af9a837 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 15 Apr 2024 10:07:17 +0200 Subject: [PATCH 110/111] eepers: init at 1.3 --- pkgs/by-name/ee/eepers/package.nix | 81 ++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 pkgs/by-name/ee/eepers/package.nix diff --git a/pkgs/by-name/ee/eepers/package.nix b/pkgs/by-name/ee/eepers/package.nix new file mode 100644 index 000000000000..d642252774e9 --- /dev/null +++ b/pkgs/by-name/ee/eepers/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gnat, + raylib, + alsa-lib, + wayland, +}: + +stdenv.mkDerivation rec { + pname = "eepers"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "tsoding"; + repo = "eepers"; + rev = "refs/tags/v${version}"; + hash = "sha256-KG7ci327qlTtlN4yV54P8Q34ExFLJfTGMTZxN3RtZbc="; + }; + + postPatch = '' + substituteInPlace eepers.adb \ + --replace-fail "assets/" "$out/assets/" + ''; + + buildInputs = [ + gnat + raylib + ]; + + buildPhase = '' + runHook preBuild + + gnatmake -f -O3 \ + -Wall \ + -Wextra \ + -gnat2012 \ + -o eepers-linux eepers.adb \ + -bargs \ + -largs -lraylib -lm \ + -pthread + + runHook postBuild + ''; + + postFixup = '' + patchelf $out/bin/eepers \ + --add-needed libwayland-client.so \ + --add-needed libwayland-cursor.so \ + --add-needed libwayland-egl.so \ + --add-needed libasound.so \ + --add-rpath ${ + lib.makeLibraryPath [ + alsa-lib + wayland + ] + } + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp ./eepers-linux $out/bin/eepers + + cp -r ./assets $out/ + + runHook postInstall + ''; + + meta = { + description = "Simple Turn-based Game"; + homepage = "https://github.com/tsoding/eepers"; + changelog = "https://github.com/tsoding/eepers/blob/${src.rev}/CHANGELOG.txt"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "eepers"; + platforms = lib.platforms.all; + }; +} From 752d81e439573637074c069df35fda58d4ff73c9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 12 May 2024 14:16:42 +0200 Subject: [PATCH 111/111] neovim: 0.9.5 -> 0.10.0 Changelog: https://neovim.io/doc/user/news-0.10.html --- pkgs/by-name/ne/neovim-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 0dd8ca8a0877..b7b66d8544ff 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: in { pname = "neovim-unwrapped"; - version = "0.9.5"; + version = "0.10.0"; __structuredAttrs = true; @@ -74,7 +74,7 @@ in { owner = "neovim"; repo = "neovim"; rev = "v${finalAttrs.version}"; - hash = "sha256-CcaBqA0yFCffNPmXOJTo8c9v1jrEBiqAl8CG5Dj5YxE="; + hash = "sha256-FCOipXHkAbkuFw9JjEpOIJ8BkyMkjkI0Dp+SzZ4yZlw="; }; patches = [