From 8157ccb9bb42eec9f2e56d1742e4894905b4754b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Sep 2024 10:04:24 +0000 Subject: [PATCH 01/35] python312Packages.albucore: 0.0.14 -> 0.0.15 --- pkgs/development/python-modules/albucore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix index aea9b5ab6954..b176b817da83 100644 --- a/pkgs/development/python-modules/albucore/default.nix +++ b/pkgs/development/python-modules/albucore/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "albucore"; - version = "0.0.14"; + version = "0.0.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "albumentations-team"; repo = "albucore"; rev = "refs/tags/${version}"; - hash = "sha256-6c6QiChP3SLTEj1SKlb/AcjQbLX4L9Fdlxem70cxiXM="; + hash = "sha256-FA11dVw47KucSYU1+3oxw6GUQfPZtjoNPUb96vb6wqo="; }; pythonRemoveDeps = [ "opencv-python" ]; From 226cac0b001d5d0893e43b5641c8cda04281339b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Sep 2024 14:37:16 +0000 Subject: [PATCH 02/35] python312Packages.dash: 2.18.0 -> 2.18.1 --- 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 3ba13153d123..d514c8b454e7 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "dash"; - version = "2.18.0"; + version = "2.18.1"; pyproject = true; src = fetchFromGitHub { owner = "plotly"; repo = "dash"; rev = "refs/tags/v${version}"; - hash = "sha256-4/MiiS2uspjfGg0KIrgzShG7eW10Be6CoISCOnXSou0="; + hash = "sha256-2LwM1lrJNdekoDN+wDHgaSlGOnpK618r65UHj7cP59E="; }; nativeBuildInputs = [ From 29a1bcb9ec9660f5bee962b1e8682850c4a5f5be Mon Sep 17 00:00:00 2001 From: Marie Date: Fri, 20 Sep 2024 11:03:13 +0200 Subject: [PATCH 03/35] doc: 24.11: fix taskwarrior typo --- nixos/doc/manual/release-notes/rl-2411.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 6659fddf4cee..4b01f4afd007 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -58,7 +58,7 @@ ## New Modules {#sec-release-24.11-new-modules} -- [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwariror 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver). +- [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwarrior 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver). - [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable) service. From 297f1bc1727a6c8ce490df633d4e03862c381b85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Sep 2024 03:50:55 +0000 Subject: [PATCH 04/35] python312Packages.dask-awkward: 2024.7.0 -> 2024.9.0 --- pkgs/development/python-modules/dask-awkward/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 959d83b96bcd..e952a358e9d6 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2024.7.0"; + version = "2024.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,11 +37,9 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-xy3rq/gXQUtquvyWSCcBjZ+gUYT3RzxMgXThyT6Fwec="; + hash = "sha256-4CwixPj0bJHVjnwZ7fPkRdiDHs8/IzvNlwSPynXvcAo="; }; - pythonRelaxDeps = [ "awkward" ]; - build-system = [ hatch-vcs hatchling From d52a7b2b5a49246ab54fcb9f9d20d013e6e494c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Sep 2024 03:52:17 +0000 Subject: [PATCH 05/35] python312Packages.emoji: 2.12.1 -> 2.13.0 --- pkgs/development/python-modules/emoji/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index d6f1fd245931..0a0bb89d89bd 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "emoji"; - version = "2.12.1"; + version = "2.13.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "carpedm20"; - repo = pname; + repo = "emoji"; rev = "refs/tags/v${version}"; - hash = "sha256-m9V9ryIE2U+KsyzFhAoMCGYMkPCBUl/ex1Ue5OUwslc="; + hash = "sha256-FTQTbp5Ud3CyqkAiGvY8hBOKnvFR29CgZPbz4eZp/ik="; }; build-system = [ setuptools ]; From 58f8d27e0af7ab886a333bd194fc1a383c7fe21a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Sep 2024 03:35:04 +0000 Subject: [PATCH 06/35] python312Packages.art: 6.2 -> 6.3 --- pkgs/development/python-modules/art/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/art/default.nix b/pkgs/development/python-modules/art/default.nix index 0f43d311f88c..b0d50295a8aa 100644 --- a/pkgs/development/python-modules/art/default.nix +++ b/pkgs/development/python-modules/art/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, }: buildPythonPackage rec { pname = "art"; - version = "6.2"; - format = "setuptools"; + version = "6.3"; + pyproject = true; src = fetchFromGitHub { owner = "sepandhaghighi"; repo = "art"; rev = "refs/tags/v${version}"; - hash = "sha256-lFe6J3R+A1WE+LGywupjOGwhOcrUH5JE26Cit0DaT/4="; + hash = "sha256-9kz6uyLdcrQqgWzT9g2qI9a+IituY/OFmbot+HlQsCE="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "art" ]; # TypeError: art() missing 1 required positional argument: 'artname' From c8b289962d14c9df9be0279bf9b7eaf1727830dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Sep 2024 03:09:38 +0000 Subject: [PATCH 07/35] python312Packages.dask-histogram: 2024.3.0 -> 2024.9.1 --- .../python-modules/dask-histogram/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix index 26ca90ab020f..af6b480c259c 100644 --- a/pkgs/development/python-modules/dask-histogram/default.nix +++ b/pkgs/development/python-modules/dask-histogram/default.nix @@ -11,22 +11,22 @@ buildPythonPackage rec { pname = "dask-histogram"; - version = "2024.3.0"; + version = "2024.9.1"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-histogram"; rev = "refs/tags/${version}"; - hash = "sha256-RqZMAEGFqEXNmNv7SWCyQw9cI+I+Oa6s8O/7Jp+9id8="; + hash = "sha256-k+hD5y9K6Jsm++H+IAWJ/Z3wlCN4fV8RIcyAnvOvem0="; }; - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ boost-histogram dask ]; @@ -35,11 +35,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "dask_histogram" ]; - meta = with lib; { + meta = { description = "Histograms with task scheduling"; homepage = "https://dask-histogram.readthedocs.io/"; changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${version}"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ veprbl ]; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ veprbl ]; }; } From e6d5fe503b6cb401f67bb1b99a60b1e06afb80d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Sep 2024 08:20:15 +0000 Subject: [PATCH 08/35] python312Packages.langfuse: 2.45.1 -> 2.50.2 --- pkgs/development/python-modules/langfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix index 84879b365973..cd7ac3a36cc5 100644 --- a/pkgs/development/python-modules/langfuse/default.nix +++ b/pkgs/development/python-modules/langfuse/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "langfuse"; - version = "2.45.1"; + version = "2.50.2"; pyproject = true; src = fetchFromGitHub { owner = "langfuse"; repo = "langfuse-python"; rev = "refs/tags/v${version}"; - hash = "sha256-CErrC5hVBrdUFYxN3JxAIo5eb/OGnISWfzClSwrrYLM="; + hash = "sha256-CKydYXcwWB4fnomPBdOLTwRBLBtxqoNHdP2RBzcrjpk="; }; build-system = [ poetry-core ]; From 197ca79a3cc9a85033efba153ea1786dc0a3e892 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Sep 2024 09:34:02 +0000 Subject: [PATCH 09/35] python312Packages.marimo: 0.8.15 -> 0.8.18 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 5ed9926e1063..15eb58f35d13 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.8.15"; + version = "0.8.18"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-S+lhoyM8s6wLFq1oGJMdzq+s+Uhn76qMgbkMUwpVr44="; + hash = "sha256-7gAxD1N2z80qDtC2PrijuJwO/UdgAGvpryYjwEoUTMo="; }; build-system = [ setuptools ]; From 29a41744f6edef5dd8cc44132861e74134cc3272 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 21 Sep 2024 21:49:45 +0200 Subject: [PATCH 10/35] vimPlugins.render-markdown-nvim: fix broken alias --- pkgs/applications/editors/vim/plugins/generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4464302dde13..852fa77c6c07 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -18432,8 +18432,8 @@ final: prev: meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/"; }; - render-markdown = buildVimPlugin { - pname = "render-markdown"; + render-markdown-nvim = buildVimPlugin { + pname = "render-markdown.nvim"; version = "2024-09-15"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; From 1011fb027003ea62bb6ef73a5853680450c4b317 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Sep 2024 19:57:41 +0000 Subject: [PATCH 11/35] terraform-local: 0.19.0 -> 0.20.0 --- pkgs/by-name/te/terraform-local/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/terraform-local/package.nix b/pkgs/by-name/te/terraform-local/package.nix index 62470b74704d..34f636cb9e55 100644 --- a/pkgs/by-name/te/terraform-local/package.nix +++ b/pkgs/by-name/te/terraform-local/package.nix @@ -5,12 +5,12 @@ }: python3Packages.buildPythonApplication rec { pname = "terraform_local"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-0E11eaEhz1pwP9MBVilqioj92fZP7wjLJcR4no79n9s="; + hash = "sha256-Lxx/gtjLufFZWzcvOiiSUUptM7JtFnigBN7DG+lhQxg="; }; build-system = with python3Packages; [ setuptools ]; From 8a242099b8601f5c0c11a45bcf935fac3276f685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 21 Sep 2024 18:20:38 -0700 Subject: [PATCH 12/35] python312Packages.blacken-docs: move from top-level We need it as a Python module for nbqa. --- .../python-modules}/blacken-docs/default.nix | 25 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 17 insertions(+), 12 deletions(-) rename pkgs/{tools/misc => development/python-modules}/blacken-docs/default.nix (73%) diff --git a/pkgs/tools/misc/blacken-docs/default.nix b/pkgs/development/python-modules/blacken-docs/default.nix similarity index 73% rename from pkgs/tools/misc/blacken-docs/default.nix rename to pkgs/development/python-modules/blacken-docs/default.nix index 434f684b78d2..7370471c2604 100644 --- a/pkgs/tools/misc/blacken-docs/default.nix +++ b/pkgs/development/python-modules/blacken-docs/default.nix @@ -1,12 +1,16 @@ -{ black -, fetchFromGitHub -, lib -, python3 +{ + black, + buildPythonPackage, + fetchFromGitHub, + lib, + pytestCheckHook, + setuptools, }: -python3.pkgs.buildPythonApplication rec { + +buildPythonPackage rec { pname = "blacken-docs"; version = "1.15.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "adamchainz"; @@ -15,17 +19,16 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-3FGuFOAHCcybPwujWlh58NWtuF5CebaKTgBWgCGpSL8="; }; - nativeBuildInputs = [ - python3.pkgs.setuptools + build-system = [ + setuptools ]; - propagatedBuildInputs = [ + dependencies = [ black ]; nativeCheckInputs = [ - black - python3.pkgs.pytestCheckHook + pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c874ee7429e3..cce8fa3b248f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6605,7 +6605,7 @@ with pkgs; bbin = callPackage ../development/tools/bbin { }; - blacken-docs = callPackage ../tools/misc/blacken-docs { }; + blacken-docs = with python3Packages; toPythonApplication blacken-docs; bore = callPackage ../tools/networking/bore { inherit (darwin) Libsystem; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 74cb990650ae..62bcc9a550c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1667,6 +1667,8 @@ self: super: with self; { black = callPackage ../development/python-modules/black { }; + blacken-docs = callPackage ../development/python-modules/blacken-docs { }; + blackjax = callPackage ../development/python-modules/blackjax { }; black-macchiato = callPackage ../development/python-modules/black-macchiato { }; From 26bfa2c7f2a3801a17a13986105842f42ea90172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 21 Sep 2024 18:15:24 -0700 Subject: [PATCH 13/35] nbqa: update dependencies --- pkgs/by-name/nb/nbqa/package.nix | 56 +++++++++++++------------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/nb/nbqa/package.nix b/pkgs/by-name/nb/nbqa/package.nix index f4b1a8fdf527..1c09784febbd 100644 --- a/pkgs/by-name/nb/nbqa/package.nix +++ b/pkgs/by-name/nb/nbqa/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, # optional-dependencies - black, - blacken-docs, ruff, # passthru @@ -28,27 +26,27 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - passthru.optional-dependencies = { - black = [ black ]; - blacken-docs = [ blacken-docs ]; - flake8 = [ python3.pkgs.flake8 ]; - isort = [ python3.pkgs.isort ]; - jupytext = [ python3.pkgs.jupytext ]; - mypy = [ python3.pkgs.mypy ]; - pylint = [ python3.pkgs.pylint ]; - pyupgrade = [ python3.pkgs.pyupgrade ]; - ruff = [ ruff ]; - }; + optional-dependencies.toolchain = + (with python3.pkgs; [ + black + blacken-docs + flake8 + isort + jupytext + mypy + pylint + pyupgrade + ]) + ++ [ + ruff + ]; - dependencies = - with python3.pkgs; - [ - autopep8 - ipython - tokenize-rt - tomli - ] - ++ builtins.attrValues passthru.optional-dependencies; + dependencies = with python3.pkgs; [ + autopep8 + ipython + tokenize-rt + tomli + ]; postPatch = '' # Force using the Ruff executable rather than the Python package @@ -61,24 +59,16 @@ python3.pkgs.buildPythonApplication rec { ''; nativeCheckInputs = - [ - black - ruff - ] - ++ (with python3.pkgs; [ + (with python3.pkgs; [ autoflake distutils - flake8 - isort - jupytext mdformat pre-commit-hooks pydocstyle - pylint pytestCheckHook - pyupgrade yapf - ]); + ]) + ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # Test data not found From de654eed30048b6c74df251b03569bcfc149e6c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Sep 2024 10:26:01 +0000 Subject: [PATCH 14/35] python312Packages.pulumi-aws: 6.51.0 -> 6.52.0 --- pkgs/development/python-modules/pulumi-aws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 837c83854919..a72a47661739 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "6.51.0"; + version = "6.52.0"; pyproject = true; build-system = [ setuptools ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-aEyi4zFj0Q3KNBXjUX5J7nmmPCcnYn5w0mIC02gbGJc="; + hash = "sha256-EYDvhgUOWMj2kahzwkg8L43D42YGo2IHrrmKFhMPOb0="; }; sourceRoot = "${src.name}/sdk/python"; From 3872fa981452040e37564a056deb311641998a55 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 22 Sep 2024 23:40:58 +0200 Subject: [PATCH 15/35] iwqr: init at 0.1.1 --- pkgs/by-name/iw/iwqr/package.nix | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/iw/iwqr/package.nix diff --git a/pkgs/by-name/iw/iwqr/package.nix b/pkgs/by-name/iw/iwqr/package.nix new file mode 100644 index 000000000000..5609c70d4c3b --- /dev/null +++ b/pkgs/by-name/iw/iwqr/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitea, + nix-update-script, + testers, + iwqr, +}: + +rustPlatform.buildRustPackage rec { + pname = "iwqr"; + version = "0.1.1"; + + src = fetchFromGitea { + domain = "git.kroner.dev"; + owner = "kreny"; + repo = "iwqr"; + rev = "v${version}"; + hash = "sha256-z9CjCJvi6MlZGghZKx13gGSKwUnECAf0cr9P2ABskh0="; + }; + + cargoHash = "sha256-EFen2x/+a5xLsDmodNCkuGBR7+Oy2fdXcxzANLcWWZs="; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = iwqr; + }; + }; + + meta = with lib; { + description = "Tool for generating qr codes for iwd networks"; + homepage = "https://git.kroner.dev/kreny/iwqr"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ h7x4 ]; + mainProgram = "iwqr"; + }; +} From 72afec8da6ab11989823073f01261a445fc5b2ec Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Mon, 23 Sep 2024 10:00:37 +0200 Subject: [PATCH 16/35] plplot: nixfmt --- pkgs/development/libraries/plplot/default.nix | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/plplot/default.nix b/pkgs/development/libraries/plplot/default.nix index 6e4e47f094ed..5b0948a86cd9 100644 --- a/pkgs/development/libraries/plplot/default.nix +++ b/pkgs/development/libraries/plplot/default.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchurl -, cmake -, enableWX ? false -, wxGTK32 -, Cocoa -, enableXWin ? false -, xorg +{ + lib, + stdenv, + fetchurl, + cmake, + enableWX ? false, + wxGTK32, + Cocoa, + enableXWin ? false, + xorg, }: stdenv.mkDerivation rec { - pname = "plplot"; + pname = "plplot"; version = "5.15.0"; src = fetchurl { @@ -20,7 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional enableWX wxGTK32 + buildInputs = + lib.optional enableWX wxGTK32 ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa ++ lib.optional enableXWin xorg.libX11; @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { inherit enableWX enableXWin - ; + ; }; cmakeFlags = [ @@ -41,9 +43,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform scientific graphics plotting library"; mainProgram = "pltek"; - homepage = "https://plplot.org"; + homepage = "https://plplot.org"; maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.lgpl2; + platforms = platforms.unix; + license = licenses.lgpl2; }; } From a50b031b1e1d04f9a73ed3ffe99a1dd48c4eb416 Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Mon, 23 Sep 2024 10:01:59 +0200 Subject: [PATCH 17/35] plplot: compile optional png support --- pkgs/development/libraries/plplot/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/plplot/default.nix b/pkgs/development/libraries/plplot/default.nix index 5b0948a86cd9..b060351a2f26 100644 --- a/pkgs/development/libraries/plplot/default.nix +++ b/pkgs/development/libraries/plplot/default.nix @@ -3,11 +3,15 @@ stdenv, fetchurl, cmake, + pkg-config, enableWX ? false, wxGTK32, Cocoa, enableXWin ? false, xorg, + enablePNG ? false, + cairo, + pango, }: stdenv.mkDerivation rec { @@ -19,12 +23,19 @@ stdenv.mkDerivation rec { sha256 = "0ywccb6bs1389zjfmc9zwdvdsvlpm7vg957whh6b5a96yvcf8bdr"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; buildInputs = lib.optional enableWX wxGTK32 ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa - ++ lib.optional enableXWin xorg.libX11; + ++ lib.optional enableXWin xorg.libX11 + ++ lib.optionals enablePNG [ + cairo + pango + ]; passthru = { inherit (xorg) libX11; From 0ed2854362b7a593fa7c6ece69c12fde392b2a32 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 21 Sep 2024 21:43:08 +0200 Subject: [PATCH 18/35] vimPlugins.render-markdown-nvim: add nvim-treesitter dependency --- pkgs/applications/editors/vim/plugins/overrides.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 2bfda55a474d..51939763a911 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1498,6 +1498,11 @@ dependencies = with self; [ nvim-treesitter plenary-nvim ]; }; + render-markdown-nvim = super.render-markdown-nvim.overrideAttrs { + dependencies = with self; [ nvim-treesitter ]; + nvimRequireCheck = "render-markdown"; + }; + # needs "http" and "json" treesitter grammars too rest-nvim = super.rest-nvim.overrideAttrs { dependencies = with self; [ From 86a570fd2e07d3ae977f47d97a87d2dffb10e9f4 Mon Sep 17 00:00:00 2001 From: Saturn745 Date: Mon, 23 Sep 2024 08:04:12 -0700 Subject: [PATCH 19/35] klipperscreen: 0.4.3 -> 0.4.4 Update repo owner field --- pkgs/applications/misc/klipperscreen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/klipperscreen/default.nix b/pkgs/applications/misc/klipperscreen/default.nix index fea8dbc80e23..0ef76edd4262 100644 --- a/pkgs/applications/misc/klipperscreen/default.nix +++ b/pkgs/applications/misc/klipperscreen/default.nix @@ -6,14 +6,14 @@ , gitUpdater }: python3.pkgs.buildPythonApplication rec { pname = "KlipperScreen"; - version = "0.4.3"; + version = "0.4.4"; format = "other"; src = fetchFromGitHub { - owner = "jordanruthe"; + owner = "KlipperScreen"; repo = "KlipperScreen"; rev = "v${version}"; - hash = "sha256-6hMefH9VcNnWhKdQRs7cPVL86LEDRSLaxygmi15HdLI="; + hash = "sha256-MxuUmkuEnfFC0iPwNUc0Wh8bIEl1J1FMgGEYMjHePZ8="; }; nativeBuildInputs = [ From 2dffa692b4087d572f426ba1ce82e9b92cbea60a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 15:40:56 +0000 Subject: [PATCH 20/35] sentry-native: 0.7.9 -> 0.7.10 --- pkgs/development/libraries/sentry-native/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index 7f6325faef25..6e12e19d596a 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.7.9"; + version = "0.7.10"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-L7VlsxgjWPCceDuJ9OR6Et6wzaBn1hb0AOFbc7PuZWw="; + hash = "sha256-1Pro2BXflitUGVbzvjwdSFqwWM/EeuDC3eHEj+7qwm8="; }; nativeBuildInputs = [ From 54cf1e8f1f8089dd369d60cfcec630e6513c2a6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 15:46:58 +0000 Subject: [PATCH 21/35] python312Packages.libmambapy: 2024.08.31 -> 2024.09.20 --- pkgs/development/python-modules/libmambapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix index 37ed199cd8a9..980109e499b6 100644 --- a/pkgs/development/python-modules/libmambapy/default.nix +++ b/pkgs/development/python-modules/libmambapy/default.nix @@ -22,14 +22,14 @@ }: buildPythonPackage rec { pname = "libmambapy"; - version = "2024.08.31"; + version = "2024.09.20"; pyproject = true; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "refs/tags/${version}"; - hash = "sha256-RRHu0JM1okFprNIrQLLIYN7xZdZ+A6OuCZM5E1oPoFg="; + hash = "sha256-/mfZEfpB4CQ2f8zyzYbnjvBgK4VEPngTNQJT4Oh62Qs="; }; nativeBuildInputs = [ From 265f51a3cb0fa69b668c976e47bb2be25cf4d4f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 17:09:14 +0000 Subject: [PATCH 22/35] python312Packages.knocki: 0.3.2 -> 0.3.5 --- pkgs/development/python-modules/knocki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/knocki/default.nix b/pkgs/development/python-modules/knocki/default.nix index 953eaf9b10f5..c5c5442fdfe7 100644 --- a/pkgs/development/python-modules/knocki/default.nix +++ b/pkgs/development/python-modules/knocki/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "knocki"; - version = "0.3.2"; + version = "0.3.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "swan-solutions"; repo = "knocki-homeassistant"; rev = "refs/tags/v${version}"; - hash = "sha256-WdX/RvLjxkElgDXVMXcslYWlupQ7RDns5F+Y5XGQk5w="; + hash = "sha256-Fb3skFttY5gtm80k1LCUQ4Z7/TQGClCNcWt1k6bLQoI="; }; postPatch = '' From 8637cb0249201b3071971c973d44ce2fea380efa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 18:30:30 +0000 Subject: [PATCH 23/35] containerlab: 0.57.1 -> 0.57.3 --- pkgs/by-name/co/containerlab/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix index cb22d5ef6e7b..a73f33f0bc74 100644 --- a/pkgs/by-name/co/containerlab/package.nix +++ b/pkgs/by-name/co/containerlab/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "containerlab"; - version = "0.57.1"; + version = "0.57.3"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-b7Y65DCBDTyScGvYrz83ZN2oWN64ydoVXnssdnuZjQw="; + hash = "sha256-OSisVSfbOKBA1INrhj8DaWnHOEsLPwazp6NSXwAG3PU="; }; nativeBuildInputs = [ installShellFiles ]; From 23e6b80a0185c9c9268f40adc58e23ca4ff0a4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 21 Sep 2024 18:47:29 -0700 Subject: [PATCH 24/35] nbqa: use versionCheckHook --- pkgs/by-name/nb/nbqa/package.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/nb/nbqa/package.nix b/pkgs/by-name/nb/nbqa/package.nix index 1c09784febbd..5d713cd058d0 100644 --- a/pkgs/by-name/nb/nbqa/package.nix +++ b/pkgs/by-name/nb/nbqa/package.nix @@ -6,9 +6,8 @@ # optional-dependencies ruff, - # passthru - testers, - nbqa, + # tests + versionCheckHook, }: python3.pkgs.buildPythonApplication rec { pname = "nbqa"; @@ -68,7 +67,8 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook yapf ]) - ++ lib.flatten (lib.attrValues optional-dependencies); + ++ lib.flatten (lib.attrValues optional-dependencies) + ++ [ versionCheckHook ]; disabledTests = [ # Test data not found @@ -88,12 +88,6 @@ python3.pkgs.buildPythonApplication rec { "tests/test_include_exclude.py" ]; - passthru = { - tests.version = testers.testVersion { - package = nbqa; - }; - }; - meta = { homepage = "https://github.com/nbQA-dev/nbQA"; changelog = "https://nbqa.readthedocs.io/en/latest/history.html"; From 479a1a6c167a070400057e20a87d8af302d1cda1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 21 Sep 2024 18:36:36 -0700 Subject: [PATCH 25/35] nbqa: add passthru.withTools You can now do fancy things like (nbqa.override { python3 = python311; }).withTools (ps: [ ps.black ]) --- pkgs/by-name/nb/nbqa/package.nix | 170 +++++++++++++++++-------------- 1 file changed, 94 insertions(+), 76 deletions(-) diff --git a/pkgs/by-name/nb/nbqa/package.nix b/pkgs/by-name/nb/nbqa/package.nix index 5d713cd058d0..07fdcdde271a 100644 --- a/pkgs/by-name/nb/nbqa/package.nix +++ b/pkgs/by-name/nb/nbqa/package.nix @@ -9,91 +9,109 @@ # tests versionCheckHook, }: -python3.pkgs.buildPythonApplication rec { - pname = "nbqa"; - version = "1.9.0"; - pyproject = true; - src = fetchFromGitHub { - owner = "nbQA-dev"; - repo = "nbQA"; - rev = "refs/tags/${version}"; - hash = "sha256-9s+q2unh+jezU0Er7ZH0tvgntmPFts9OmsgAMeQXRrY="; - }; +let + nbqa = python3.pkgs.buildPythonApplication rec { + pname = "nbqa"; + version = "1.9.0"; + pyproject = true; - build-system = with python3.pkgs; [ - setuptools - ]; + src = fetchFromGitHub { + owner = "nbQA-dev"; + repo = "nbQA"; + rev = "refs/tags/${version}"; + hash = "sha256-9s+q2unh+jezU0Er7ZH0tvgntmPFts9OmsgAMeQXRrY="; + }; - optional-dependencies.toolchain = - (with python3.pkgs; [ - black - blacken-docs - flake8 - isort - jupytext - mypy - pylint - pyupgrade - ]) - ++ [ - ruff + build-system = with python3.pkgs; [ + setuptools ]; - dependencies = with python3.pkgs; [ - autopep8 - ipython - tokenize-rt - tomli - ]; + optional-dependencies.toolchain = + (with python3.pkgs; [ + black + blacken-docs + flake8 + isort + jupytext + mypy + pylint + pyupgrade + ]) + ++ [ + ruff + ]; - postPatch = '' - # Force using the Ruff executable rather than the Python package - substituteInPlace nbqa/__main__.py --replace 'if shell:' 'if shell or main_command == "ruff":' - ''; + dependencies = with python3.pkgs; [ + autopep8 + ipython + tokenize-rt + tomli + ]; - preCheck = '' - # Allow the tests to run `nbqa` itself from the path - export PATH="$out/bin":"$PATH" - ''; + postPatch = '' + # Force using the Ruff executable rather than the Python package + substituteInPlace nbqa/__main__.py --replace 'if shell:' 'if shell or main_command == "ruff":' + ''; - nativeCheckInputs = - (with python3.pkgs; [ - autoflake - distutils - mdformat - pre-commit-hooks - pydocstyle - pytestCheckHook - yapf - ]) - ++ lib.flatten (lib.attrValues optional-dependencies) - ++ [ versionCheckHook ]; + preCheck = '' + # Allow the tests to run `nbqa` itself from the path + export PATH="$out/bin":"$PATH" + ''; - disabledTests = [ - # Test data not found - "test_black_multiple_files" - "test_black_return_code" - "test_grep" - "test_jupytext_on_folder" - "test_mypy_works" - "test_running_in_different_dir_works" - "test_unable_to_reconstruct_message_pythonpath" - "test_with_subcommand" - "test_pylint_works" - ]; + nativeCheckInputs = + (with python3.pkgs; [ + autoflake + distutils + mdformat + pre-commit-hooks + pydocstyle + pytestCheckHook + yapf + ]) + ++ lib.flatten (lib.attrValues optional-dependencies) + ++ [ versionCheckHook ]; - disabledTestPaths = [ - # Test data not found - "tests/test_include_exclude.py" - ]; + disabledTests = [ + # Test data not found + "test_black_multiple_files" + "test_black_return_code" + "test_grep" + "test_jupytext_on_folder" + "test_mypy_works" + "test_running_in_different_dir_works" + "test_unable_to_reconstruct_message_pythonpath" + "test_with_subcommand" + "test_pylint_works" + ]; - meta = { - homepage = "https://github.com/nbQA-dev/nbQA"; - changelog = "https://nbqa.readthedocs.io/en/latest/history.html"; - description = "Run ruff, isort, pyupgrade, mypy, pylint, flake8, black, blacken-docs, and more on Jupyter Notebooks"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ l0b0 ]; - mainProgram = "nbqa"; + disabledTestPaths = [ + # Test data not found + "tests/test_include_exclude.py" + ]; + + passthru = { + # selector is a function mapping pythonPackages to a list of code quality + # tools, e.g. nbqa.withTools (ps: [ ps.black ]) + withTools = + selector: + nbqa.overridePythonAttrs ( + { dependencies, ... }: + { + dependencies = dependencies ++ selector python3.pkgs; + doCheck = false; + } + ); + }; + + meta = { + homepage = "https://github.com/nbQA-dev/nbQA"; + changelog = "https://nbqa.readthedocs.io/en/latest/history.html"; + description = "Run ruff, isort, pyupgrade, mypy, pylint, flake8, black, blacken-docs, and more on Jupyter Notebooks"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ l0b0 ]; + mainProgram = "nbqa"; + }; }; -} +in +nbqa From a8b484780df0de74ba7ac381ca19c3713f790268 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Mon, 23 Sep 2024 21:02:42 +0200 Subject: [PATCH 26/35] python311Packages.osc-placement: init at 4.5.0 https://opendev.org/openstack/osc-placement --- .../python-modules/osc-placement/default.nix | 73 +++++++++++++++++++ .../python-openstackclient/default.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 77 insertions(+) create mode 100644 pkgs/development/python-modules/osc-placement/default.nix diff --git a/pkgs/development/python-modules/osc-placement/default.nix b/pkgs/development/python-modules/osc-placement/default.nix new file mode 100644 index 000000000000..8165e098ddd3 --- /dev/null +++ b/pkgs/development/python-modules/osc-placement/default.nix @@ -0,0 +1,73 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-serialization, + oslo-utils, + oslotest, + pbr, + pythonOlder, + setuptools, + sphinxHook, + stestr, +}: + +buildPythonPackage rec { + pname = "osc-placement"; + version = "4.5.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "osc-placement"; + rev = "refs/tags/${version}"; + hash = "sha256-PUwyYOg1dymlnnTr6TnxS42ISmbS00YfOdkL+5MbYFI="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ + keystoneauth1 + osc-lib + oslo-utils + pbr + ]; + + nativeCheckInputs = [ + oslo-serialization + oslotest + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "osc_placement" ]; + + meta = { + homepage = "https://opendev.org/openstack/osc-placement"; + description = "OpenStackClient plugin for the Placement service"; + license = lib.licenses.asl20; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 890fc02a1a88..3489b57aeefc 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -5,6 +5,7 @@ ddt, openstackdocstheme, osc-lib, + osc-placement, pbr, python-barbicanclient, python-cinderclient, @@ -74,6 +75,7 @@ buildPythonPackage rec { optional-dependencies = { # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst cli-plugins = [ + osc-placement python-barbicanclient python-designateclient python-heatclient diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 091be094c5b2..56e148e7b4a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9428,6 +9428,8 @@ self: super: with self; { osc-lib = callPackage ../development/python-modules/osc-lib { }; + osc-placement = callPackage ../development/python-modules/osc-placement { }; + osc-sdk-python = callPackage ../development/python-modules/osc-sdk-python { }; oschmod = callPackage ../development/python-modules/oschmod { }; From 66763feae9cd9439424f44687beccae821ca2b84 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Mon, 23 Sep 2024 21:31:33 +0200 Subject: [PATCH 27/35] oysttyer: remove oysttyer is no longer maintained, because Twitter disabled free API access. Upstream archived the repository in 02/2023. --- .../instant-messengers/oysttyer/default.nix | 41 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/oysttyer/default.nix diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix deleted file mode 100644 index 5dc09ae1f3ee..000000000000 --- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, lib, perl, perlPackages, coreutils, -fetchFromGitHub, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "oysttyer"; - version = "2.10.0"; - - src = fetchFromGitHub { - owner = "oysttyer"; - repo = "oysttyer"; - rev = version; - sha256 = "0cm1hvi68iqgjsg15xdii271pklgzjn9j9afb1c460z71kgy3wz2"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - perl - ]; - - propagatedBuildInputs = with perlPackages; [ - DateTimeFormatDateParse - TermReadLineTTYtter - TermReadKey - ]; - - installPhase = '' - ${coreutils}/bin/install -Dm755 \ - oysttyer.pl \ - $out/bin/oysttyer - - wrapProgram $out/bin/oysttyer \ - --prefix PERL5LIB : $PERL5LIB - ''; - - meta = with lib; { - description = "Perl Console Twitter Client"; - homepage = "http://oysttyer.github.io/"; - maintainers = with maintainers; [ woffs ]; - license = with licenses; [ ffsl ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d327a66542d6..18957005dd3c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1182,6 +1182,7 @@ mapAliases { osxfuse = macfuse-stubs; # Added 2021-03-20 ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24 oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09 + oysttyer = throw "oysttyer has been removed; it is no longer maintained because of Twitter disabling free API access"; # Added 2024-09-23 ### P ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 757459aa5645..c614c1d6b4c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13250,8 +13250,6 @@ with pkgs; tvm = callPackage ../development/compilers/tvm { }; - oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; - ttfb = callPackage ../development/tools/ttfb { }; twilight = callPackage ../tools/graphics/twilight { From 19558c52e20139275af54d90e4ea7f1701201c44 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Mon, 23 Sep 2024 22:07:44 +0200 Subject: [PATCH 28/35] python311Packages.python-aodhclient: init at 3.6.0 https://docs.openstack.org/python-aodhclient/latest/ --- .../python-aodhclient/default.nix | 82 +++++++++++++++++++ .../python-openstackclient/default.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 86 insertions(+) create mode 100644 pkgs/development/python-modules/python-aodhclient/default.nix diff --git a/pkgs/development/python-modules/python-aodhclient/default.nix b/pkgs/development/python-modules/python-aodhclient/default.nix new file mode 100644 index 000000000000..9c3b015a5374 --- /dev/null +++ b/pkgs/development/python-modules/python-aodhclient/default.nix @@ -0,0 +1,82 @@ +{ + lib, + buildPythonPackage, + cliff, + fetchFromGitHub, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-i18n, + oslo-serialization, + oslo-utils, + oslotest, + osprofiler, + pbr, + pyparsing, + pythonOlder, + setuptools, + sphinxHook, + stestr, +}: + +buildPythonPackage rec { + pname = "python-aodhclient"; + version = "3.6.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "python-aodhclient"; + rev = "refs/tags/${version}"; + hash = "sha256-FArXBkDOY0Weu3Fm/M0Qgg0XHTy95MqlUidZ/hUZfB8="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ + cliff + keystoneauth1 + osc-lib + oslo-i18n + oslo-serialization + oslo-utils + osprofiler + pbr + pyparsing + ]; + + nativeCheckInputs = [ + oslotest + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "aodhclient" ]; + + meta = { + homepage = "https://opendev.org/openstack/python-aodhclient"; + description = "Client library for OpenStack Aodh API"; + license = lib.licenses.asl20; + mainProgram = "aodh"; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 3489b57aeefc..f7edf890d648 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -7,6 +7,7 @@ osc-lib, osc-placement, pbr, + python-aodhclient, python-barbicanclient, python-cinderclient, python-designateclient, @@ -76,6 +77,7 @@ buildPythonPackage rec { # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst cli-plugins = [ osc-placement + python-aodhclient python-barbicanclient python-designateclient python-heatclient diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 56e148e7b4a1..78dcb00fd643 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12559,6 +12559,8 @@ self: super: with self; { python3-openid = callPackage ../development/python-modules/python3-openid { }; + python-aodhclient = callPackage ../development/python-modules/python-aodhclient { }; + python-apt = callPackage ../development/python-modules/python-apt { }; python-arango = callPackage ../development/python-modules/python-arango { }; From f8262abfe0766684de93c6a1cc124125f85cd571 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 21:06:23 +0000 Subject: [PATCH 29/35] kulala-fmt: 1.3.2 -> 1.4.0 --- pkgs/by-name/ku/kulala-fmt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kulala-fmt/package.nix b/pkgs/by-name/ku/kulala-fmt/package.nix index 2a259f8ee482..204aaa00ad32 100644 --- a/pkgs/by-name/ku/kulala-fmt/package.nix +++ b/pkgs/by-name/ku/kulala-fmt/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kulala-fmt"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala-fmt"; rev = "v${version}"; - hash = "sha256-VWd+lUPRgDVaM8nnwah/dXjQeHsLD3OM2D8coEJDCu4="; + hash = "sha256-yq7DMrt+g5wM/tynI7Cf6MBJs/d+fP3IppndKnTJMTw="; }; vendorHash = "sha256-GazDEm/qv0nh8vYT+Tf0n4QDGHlcYtbMIj5rlZBvpKo="; From fa4850bc95c59ba224f4382d848092bc6f091679 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Sep 2024 00:13:08 +0000 Subject: [PATCH 30/35] pyright: 1.1.380 -> 1.1.381 --- pkgs/by-name/py/pyright/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 47797fa0ce15..c358234d6765 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -1,13 +1,13 @@ { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }: let - version = "1.1.380"; + version = "1.1.381"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; rev = "${version}"; - hash = "sha256-Z73g4Fjj23rRTa2yIA3bjcZd2VHgXfDuHM6D77tHnZI="; + hash = "sha256-JMLQRTv0p38rZGnoxOjVF/qzscZCegFy92PCumEWETk="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -37,7 +37,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-YlhoMvqS7pOBmRBT4mrKPggBpT1DV9xn4OdlPCR9vv8="; + npmDepsHash = "sha256-UvsBNSCKznaxtuKyQ4NOQehvhhXd9omhwRygKsr9mQo="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +51,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-Bs9GHjjSKqiu6EmeAVgyEj6QylDxK7majrlIMZgLGqU="; + npmDepsHash = "sha256-N3O8KWYeYhmbSyHTJwqFUf2wqqrsmN7Wt1jS5wI6SCE="; postPatch = '' chmod +w ../../ From c5385b14f52a4732571d1fc39f54887f70e3f5b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 18:26:56 +0000 Subject: [PATCH 31/35] python312Packages.graphrag: 0.3.3 -> 0.3.6 --- .../python-modules/graphrag/default.nix | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/graphrag/default.nix b/pkgs/development/python-modules/graphrag/default.nix index a5c1589a0348..0bc8f6f59dc0 100644 --- a/pkgs/development/python-modules/graphrag/default.nix +++ b/pkgs/development/python-modules/graphrag/default.nix @@ -12,27 +12,25 @@ datashaper, devtools, environs, - fastparquet, graspologic, json-repair, lancedb, + matplotlib, networkx, nltk, - numba, numpy, openai, + pandas, pyaml-env, + pyarrow, pydantic, python-dotenv, pyyaml, rich, - scipy, - swifter, tenacity, - textual, tiktoken, typing-extensions, - uvloop, + umap-learn, nbformat, pytest-asyncio, pytestCheckHook, @@ -40,14 +38,14 @@ buildPythonPackage rec { pname = "graphrag"; - version = "0.3.3"; + version = "0.3.6"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "graphrag"; rev = "refs/tags/v${version}"; - hash = "sha256-x1boxBF3fO+IqHnJx85mjYQHhEG8h03H90T0dtc3CNQ="; + hash = "sha256-H5ITK4m3l+rlIEYXoMIpsE9faCu6rRZuB5zaZQeArOU="; }; build-system = [ @@ -66,27 +64,25 @@ buildPythonPackage rec { datashaper devtools environs - fastparquet graspologic json-repair lancedb + matplotlib networkx nltk - numba numpy openai + pandas pyaml-env + pyarrow pydantic python-dotenv pyyaml rich - scipy - swifter tenacity - textual tiktoken typing-extensions - uvloop + umap-learn ]; env.NUMBA_CACHE_DIR = "$TMPDIR"; From 774ee796bc19095c7a35cc4d0ce187d01064994d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Sep 2024 01:36:16 +0000 Subject: [PATCH 32/35] actionlint: 1.7.1 -> 1.7.2 --- pkgs/by-name/ac/actionlint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ac/actionlint/package.nix b/pkgs/by-name/ac/actionlint/package.nix index 38090f7bebde..0d45166ffd3d 100644 --- a/pkgs/by-name/ac/actionlint/package.nix +++ b/pkgs/by-name/ac/actionlint/package.nix @@ -10,7 +10,7 @@ }: let - version = "1.7.1"; + version = "1.7.2"; in buildGoModule { pname = "actionlint"; @@ -22,10 +22,10 @@ buildGoModule { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - hash = "sha256-nu3Bj85L68YFNE4loh548A8ik3NCj4V32FlDV8V6BEE="; + hash = "sha256-/VhSmNwAhgAM/506MjI07KBFbkBTLpQfod49ysju+uU="; }; - vendorHash = "sha256-ZREtrdHUD1B1Mogidp1y/kFTK+KR4qYJj1c/M+0utPM="; + vendorHash = "sha256-SIY79SjYYXW2slUQr2Bm9dLH8K2wE3l/TL3QP0m8GLs="; nativeBuildInputs = [ makeWrapper From c6dddb460d2a69b8ffde1f179b82c8dafc5f6fa9 Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Mon, 23 Sep 2024 15:21:47 -0400 Subject: [PATCH 33/35] mscp: init at 0.2.1 --- pkgs/by-name/ms/mscp/package.nix | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/ms/mscp/package.nix diff --git a/pkgs/by-name/ms/mscp/package.nix b/pkgs/by-name/ms/mscp/package.nix new file mode 100644 index 000000000000..f95b0a249d5f --- /dev/null +++ b/pkgs/by-name/ms/mscp/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + zlib, + openssl, + krb5, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "mscp"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "upa"; + repo = "mscp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-TWwvPLqGLhh/IE+hIz/jwaGLBoASs78Iqai1TxN7Wps="; + fetchSubmodules = true; + }; + + postPatch = '' + echo ${lib.escapeShellArg finalAttrs.version} > VERSION + patch -d libssh -p1 < patch/libssh-0.10.6-2-g6f1b1e76.patch + ''; + + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + krb5 + openssl + zlib + ]; + + meta = { + description = "Transfer files over multiple SSH (SFTP) connections"; + homepage = "https://github.com/upa/mscp"; + mainProgram = "mscp"; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.deshaw.members; + platforms = lib.platforms.unix; + }; +}) From 80b7689946ea567b9df5a88346e0fda18a83305a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Sep 2024 04:22:42 +0000 Subject: [PATCH 34/35] api-linter: 1.67.2 -> 1.67.3 --- pkgs/by-name/ap/api-linter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix index 9a01c0548e60..0e82446e666a 100644 --- a/pkgs/by-name/ap/api-linter/package.nix +++ b/pkgs/by-name/ap/api-linter/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "api-linter"; - version = "1.67.2"; + version = "1.67.3"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-xwRpJKAkZFSpmAQti2EswM6RXlJVwD+nNY9t5oRzU1s="; + hash = "sha256-uyupDoLLF1lqYaufBsSNDjKVGF0JsRnephkq4Hk3aMU="; }; vendorHash = "sha256-+dyoWK5iXH480c+akg26BCF/J8lKQoATVqZUfqMa080="; From 0dab659ce648a04b425456dcb8b132f89d8c34b1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 23 Sep 2024 23:15:11 +0200 Subject: [PATCH 35/35] python312Packages.ray: 2.36.0 -> 2.36.1 Diff: https://github.com/ray-project/ray/compare/ray-2.36.0...ray-2.36.1 Changelog: https://github.com/ray-project/ray/releases/tag/ray-2.36.1 --- pkgs/development/python-modules/ray/binary-hashes.nix | 6 +++--- pkgs/development/python-modules/ray/default.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ray/binary-hashes.nix b/pkgs/development/python-modules/ray/binary-hashes.nix index 5d5a474d49dd..636d285e52ef 100644 --- a/pkgs/development/python-modules/ray/binary-hashes.nix +++ b/pkgs/development/python-modules/ray/binary-hashes.nix @@ -1,11 +1,11 @@ { cp310 = { - hash = "sha256-LaTzHub21e+qDQs4/sxCIVzaE8leAVs8y4P1jighkT8="; + hash = "sha256-74ryZ6SIQ3pBX+tZOKjf5XpVOhyoRRI8RllkRj5452g="; }; cp311 = { - hash = "sha256-Iym0IdxjsC4w5GV497RQfufdjMV/NbdGgQG9xkdy+js="; + hash = "sha256-WAidlVzqyYPVhbA9QCQ3nxUViAsJHqz1oaMm8yEgxCM="; }; cp312 = { - hash = "sha256-KXAxrkdyHKzX9pgpTTZ2PiwsXEeac0BFG6dQOkJ0seU="; + hash = "sha256-V6ye3HTXk8NYNaui1BbXyJwmtdLZurbsIiH8LpV4rcc="; }; } diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index a2fe1808201b..19728becf147 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -56,7 +56,7 @@ let pname = "ray"; - version = "2.36.0"; + version = "2.36.1"; in buildPythonPackage rec { inherit pname version;