From e881a9cb1a9c172ee1a83268ca31072e83cfa814 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Wed, 19 Jul 2023 15:07:09 +0200 Subject: [PATCH 01/35] linux_testing: 6.4-rc7 -> 6.5-rc2 `VIDEO_STK1160_COMMON` was removed in 7f7ac101236bd020681f122089b611eca8e507ac ("media: stk1160: Simplify the build config definition"). This is now guarded for newer kernels. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index dccecb62175e..fea39e6fcdf8 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -702,7 +702,7 @@ let MEDIA_PCI_SUPPORT = yes; MEDIA_USB_SUPPORT = yes; MEDIA_ANALOG_TV_SUPPORT = yes; - VIDEO_STK1160_COMMON = module; + VIDEO_STK1160_COMMON = whenOlder "6.5" module; }; "9p" = { diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 4e1c34d6ae4b..28c056092ff8 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.4-rc7"; + version = "6.5-rc2"; extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchzip { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-UDhLrKe8yMvmWbS19Xt1G3SQpAUWyKrfV3v1MJ5Vep8="; + hash = "sha256-QP7xCXl4tNppEH9Rso64n9GJ/SBGDtjA8d1TghTtKfA="; }; # Should the testing kernels ever be built on Hydra? From c81adfe72f8f7d9d20a36cd4848302f16bebce3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Fri, 14 Jul 2023 15:24:38 +0100 Subject: [PATCH 02/35] audiobookshelf: 2.2.23 -> 2.3.3 --- pkgs/servers/audiobookshelf/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/audiobookshelf/default.nix b/pkgs/servers/audiobookshelf/default.nix index f44019bf7cc4..748800f52ed6 100644 --- a/pkgs/servers/audiobookshelf/default.nix +++ b/pkgs/servers/audiobookshelf/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, pkgs, fetchFromGitHub, runCommand, buildNpmPackage, nodejs_18, tone, ffmpeg-full, util-linux, libwebp }: +{ lib, stdenv, pkgs, fetchFromGitHub, runCommand, buildNpmPackage, nodejs_18, tone, ffmpeg-full, util-linux, python3 }: let nodejs = nodejs_18; pname = "audiobookshelf"; - version = "2.2.23"; + version = "2.3.3"; src = fetchFromGitHub { owner = "advplyr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dmeqxXrVKXFIYI5/CBvGN5wAssY2DC6fIRDr2+0EL+I="; + sha256 = "sha256-wSIA2KKDKf3DNgYNNIyYNT8xyPWCZvwLcWuDhWOZpLs="; }; client = buildNpmPackage { @@ -24,7 +24,7 @@ let NODE_OPTIONS = "--openssl-legacy-provider"; npmBuildScript = "generate"; - npmDepsHash = "sha256-W4S8+4V4CrU9b+nbuH3+kKQKlIkOT9i72+YAWO/3gCQ="; + npmDepsHash = "sha256-s3CwGFK87podBJwAqh7JoMA28vnmf77iexrAbbwZlFk="; }; wrapper = import ./wrapper.nix { @@ -35,10 +35,11 @@ in buildNpmPackage { inherit pname version src; buildInputs = [ util-linux ]; + nativeBuildInputs = [ python3 ]; dontNpmBuild = true; npmInstallFlags = [ "--only-production" ]; - npmDepsHash = "sha256-XBQNLcFHq6U/yknlXiIEGulTDTw1wLBnhEi3h5dtBuE="; + npmDepsHash = "sha256-gueSlQh4tRTjIWvpNG2cj1np/zUGbjsnv3fA2owtiQY="; installPhase = '' mkdir -p $out/opt/client From c0c780587d8b2fcd0ba7e3757354bad383ae1460 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Jul 2023 08:53:51 +0000 Subject: [PATCH 03/35] python311Packages.dvc-objects: 0.23.1 -> 0.24.0 Diff: https://github.com/iterative/dvc-objects/compare/refs/tags/0.23.1...0.24.0 Changelog: https://github.com/iterative/dvc-objects/releases/tag/0.24.0 --- pkgs/development/python-modules/dvc-objects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index e619732f329d..674b456908b0 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.23.1"; + version = "0.24.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-EVhzVzgShqFbQvZD4KEw+sDWE473DMM1HyDj2okMxuk="; + hash = "sha256-yaKrG+PXrS9wwQcpEYGAGFp+xRYbhiWFE8PxUEXG52Y="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 69bf3b78d2f601d770203457344be6ef0a7451cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Jul 2023 08:54:27 +0000 Subject: [PATCH 04/35] python311Packages.dvc-data: 2.5.0 -> 2.6.0 Diff: https://github.com/iterative/dvc-data/compare/refs/tags/2.5.0...2.6.0 Changelog: https://github.com/iterative/dvc-data/releases/tag/2.6.0 --- pkgs/development/python-modules/dvc-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 6fadd434415a..f65b3eb16cd7 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.5.0"; + version = "2.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-K4quPZZnHqZkuR8moJ8TwmfHQ3BennoByZ5XW5X5rDA="; + hash = "sha256-Tqo2dhTes/HHhWqBZkJ9qW8i6FGWRx1Uk+0Q3pwsD+M="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From b686428f6a60abdc7987df68b5034e524772ac08 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Jul 2023 08:56:06 +0000 Subject: [PATCH 05/35] dvc: 3.5.1 -> 3.8.1 Diff: https://github.com/iterative/dvc/compare/refs/tags/3.5.1...3.8.1 Changelog: https://github.com/iterative/dvc/releases/tag/3.8.1 --- pkgs/applications/version-management/dvc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index cf9ba51ffae1..1cfa62ea6d47 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "dvc"; - version = "3.5.1"; + version = "3.8.1"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1kVc7+36rvIpoSinpyxMMs1/nhZrwv1pPWJsruFd1N8="; + hash = "sha256-ZHB2XAYjPwhCWHqq2Kro4CzDW34YBaknv9xBotCDkOw="; }; pythonRelaxDeps = [ From f3ff91fecd3d9280385c4c89057f56741d7727fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Jul 2023 08:56:52 +0000 Subject: [PATCH 06/35] python310Packages.dvclive: 2.12.1 -> 2.13.0 Changelog: https://github.com/iterative/dvclive/releases/tag/2.13.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 1082529bcc43..cbd787a7c22e 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "2.12.1"; + version = "2.13.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0J3XLBfH8kpIAyAnMhbS6d4vW3vtlbhCKIuaNsLZACg="; + hash = "sha256-5tvwIa2kx5MlMZV6J+NqN9v/TjOeZC6wftO102/QbCk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 8850d389fad813e74478c5b1e74b5845200a30b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 Jul 2023 09:02:32 -0700 Subject: [PATCH 07/35] python310Packages.lektor: 3.4.0b4 -> 3.4.0b8 Diff: https://github.com/lektor/lektor/compare/refs/tags/v3.4.0b4...v3.4.0b8 Changelog: https://github.com/lektor/lektor/blob/v3.4.0b8/CHANGES.md --- .../python-modules/lektor/default.nix | 47 +++++++++++++------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index 1549ea201f14..b483a05caabb 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -2,11 +2,13 @@ , babel , buildPythonPackage , click -, deprecated , exifread , fetchFromGitHub +, fetchNpmDeps , filetype , flask +, hatch-vcs +, hatchling , importlib-metadata , inifile , jinja2 @@ -14,8 +16,10 @@ , marshmallow , marshmallow-dataclass , mistune +, nodejs +, npmHooks +, pillow , pip -, pyopenssl , pytest-click , pytest-mock , pytest-pylint @@ -25,15 +29,13 @@ , python-slugify , pytz , requests -, setuptools -, typing-inspect -, watchdog +, watchfiles , werkzeug }: buildPythonPackage rec { pname = "lektor"; - version = "3.4.0b4"; + version = "3.4.0b8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -42,13 +44,28 @@ buildPythonPackage rec { owner = "lektor"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-O0bTmJqRymrQuHW19Y7/Kp+2XlbmDzcjl/jDACDlCSk="; + hash = "sha256-FtmRW4AS11zAX2jvGY8XTsPrN3mhHkIWoFY7sXmqG/U="; }; + npmDeps = fetchNpmDeps { + src = "${src}/frontend"; + hash = "sha256-Z7LP9rrVSzKoLITUarsnRbrhIw7W7TZSZUgV/OT+m0M="; + }; + + npmRoot = "frontend"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + nodejs + npmHooks.npmConfigHook + ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ babel click - deprecated exifread filetype flask @@ -58,17 +75,16 @@ buildPythonPackage rec { marshmallow marshmallow-dataclass mistune + pillow pip - pyopenssl python-slugify - pytz requests - setuptools - typing-inspect - watchdog + watchfiles werkzeug ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata + ] ++ lib.optionals (pythonOlder "3.9") [ + pytz ]; nativeCheckInputs = [ @@ -86,8 +102,11 @@ buildPythonPackage rec { ]; disabledTests = [ - # Test requires network access + # Tests require network access "test_path_installed_plugin_is_none" + "test_VirtualEnv_run_pip_install" + # expects FHS paths + "test_VirtualEnv_executable" ]; meta = with lib; { From cfef772385e506fa3a8055108a878d499b8efe23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Jul 2023 21:36:13 +0200 Subject: [PATCH 08/35] python311Packages.mypy-boto3-builder: 7.15.1 -> 7.16.1 Diff: https://github.com/youtype/mypy_boto3_builder/compare/refs/tags/7.15.1...7.16.1 Changelog: https://github.com/youtype/mypy_boto3_builder/releases/tag/7.16.1 --- .../development/python-modules/mypy-boto3-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 9952ade339c4..bc9193ec5102 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.15.1"; + version = "7.16.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-pZBAzy1MK8Mm9QyUM5/t8JKs3q/cYOmzCWRC4H0aWjY="; + hash = "sha256-zqiJqjsE54mzN1/NScKeXtRa3Tt3IzSdtnmOxP4meEE="; }; nativeBuildInputs = [ From d8ec5a7a120c9734fba1dfcbf758123fd77a3e9e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Jul 2023 12:19:40 +0200 Subject: [PATCH 09/35] python311Packages.mypy-boto3-ebs: 1.27.0 -> 1.28.0 --- pkgs/development/python-modules/mypy-boto3-ebs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-ebs/default.nix b/pkgs/development/python-modules/mypy-boto3-ebs/default.nix index cb8348934340..cd488388da74 100644 --- a/pkgs/development/python-modules/mypy-boto3-ebs/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-ebs/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-ebs"; - version = "1.27.0"; + version = "1.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hBFD5BNZ0OaHwL4iMLPNA916dLUBHTBl2f18/iOPsTs="; + hash = "sha256-DgfterQL/DbKRnvNL9I7fN8BrBwWlSP9fBNWPZUfFjs="; }; propagatedBuildInputs = [ From ba7e26a865ba797cf8f2d95375b13cdda2660765 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Jul 2023 21:36:47 +0200 Subject: [PATCH 10/35] python311Packages.mypy-boto3-ebs: 1.28.0 -> 1.28.13 --- pkgs/development/python-modules/mypy-boto3-ebs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-ebs/default.nix b/pkgs/development/python-modules/mypy-boto3-ebs/default.nix index cd488388da74..62b26ff2d21b 100644 --- a/pkgs/development/python-modules/mypy-boto3-ebs/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-ebs/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-ebs"; - version = "1.28.0"; + version = "1.28.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DgfterQL/DbKRnvNL9I7fN8BrBwWlSP9fBNWPZUfFjs="; + hash = "sha256-GhOEPhx4zD5jXyTMH75DOq0UL4LgOMkJn0U5nKciNMI="; }; propagatedBuildInputs = [ From b7fb31c6bded89ec2b879cfac474de5ca2eefd9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Jul 2023 21:37:24 +0200 Subject: [PATCH 11/35] python311Packages.mypy-boto3-s3: 1.28.8 -> 1.28.12 Changelog: https://github.com/youtype/mypy_boto3_builder/releases/tag/1.28.12 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 864a136f7353..5d9ad9c71af9 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.28.8"; + version = "1.28.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ye0X/uLA4u3rKWazeWr3s0ncxO7uVNvVmiaf25QY61U="; + hash = "sha256-fVSwPgvXLMH+aQ79zp7qyeKFXfuvoVOQoPUYyunigNI="; }; propagatedBuildInputs = [ From 293c87723a1285e23a5c8333d102f4c5108bf4f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Jul 2023 21:38:16 +0200 Subject: [PATCH 12/35] python311Packages.nclib: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/nclib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nclib/default.nix b/pkgs/development/python-modules/nclib/default.nix index 244f49a48e5b..e6db538859fc 100644 --- a/pkgs/development/python-modules/nclib/default.nix +++ b/pkgs/development/python-modules/nclib/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nclib"; - version = "1.0.2"; + version = "1.0.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-rA8oeYvMhw8HURxPLBRqpMHnAez/xBjyPFoKXIIvBjg="; + hash = "sha256-26KjYMxJMj5ANb2ej9hVl689sAcGHp89QUkH2xiLhZk="; }; # Project has no tests From 3db3151cf172212001a8b5e275c2250f38a81d6a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Jul 2023 21:40:35 +0200 Subject: [PATCH 13/35] python311Packages.plugwise: 0.31.8 -> 0.31.9 Diff: https://github.com/plugwise/python-plugwise/compare/refs/tags/v0.31.8...v0.31.9 Changelog: https://github.com/plugwise/python-plugwise/releases/tag/v0.31.9 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 4cd07a0249d8..7c7d36167fea 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.31.8"; + version = "0.31.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-glC/2bpjw0SKE6EezWLk9a4otBU21JSxsbIE5/LBGnY="; + hash = "sha256-IRetWNKVzWsrHOphdgV5xmdiubwDx8KOUA7x+BmTt9A="; }; propagatedBuildInputs = [ From 4926b97700326b60c96f2deaa32a6069bda0bd1b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Jul 2023 21:42:04 +0200 Subject: [PATCH 14/35] python311Packages.yabadaba: 0.2.0 -> 0.2.1 Diff: https://github.com/usnistgov/yabadaba/compare/v0.2.0...v0.2.1 --- pkgs/development/python-modules/yabadaba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yabadaba/default.nix b/pkgs/development/python-modules/yabadaba/default.nix index c83b61bafe5d..bc8146a91489 100644 --- a/pkgs/development/python-modules/yabadaba/default.nix +++ b/pkgs/development/python-modules/yabadaba/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "yabadaba"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "usnistgov"; repo = pname; rev = "v${version}"; - hash = "sha256-PXmkRbCFag2WAtodwgb3kX+hRDZdCKKi/YwAMSQePxQ="; + hash = "sha256-D3dzO+vhf1utBMmX2RUgvxuaPneFnXDseqfz6CMDmv4="; }; propagatedBuildInputs = [ From cf1c8bae75d731a7c30193b1273fcf92d241ccfe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Jul 2023 21:42:22 +0200 Subject: [PATCH 15/35] python311Packages.potentials: 0.3.6 -> 0.3.7 --- pkgs/development/python-modules/potentials/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/potentials/default.nix b/pkgs/development/python-modules/potentials/default.nix index 87c374fd533e..4cad316d2a66 100644 --- a/pkgs/development/python-modules/potentials/default.nix +++ b/pkgs/development/python-modules/potentials/default.nix @@ -20,7 +20,7 @@ }: buildPythonPackage rec { - version = "0.3.6"; + version = "0.3.7"; pname = "potentials"; format = "setuptools"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-VEPGa3Wp+B3KterfA5XGjaDf6sIAkSST0GWdeqaJcE0="; + hash = "sha256-vkrNVRf9ntYSpf8nXmAmGjc+sQ4iFllisYHd9s+uQv0="; }; propagatedBuildInputs = [ From 464c912eaa8fcd84e9267d58231947b0e0bd200a Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 29 Jul 2023 10:20:54 +0200 Subject: [PATCH 16/35] python3Packages.pyqt6: 6.5.1 -> 6.5.2 --- pkgs/development/python-modules/pyqt/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index 3edf1adf0284..22f2048ba1d3 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "PyQt6"; - version = "6.5.1"; + version = "6.5.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-4WagVownvMjbACcaUEOTYiZpC2pKdM4KXK60CAQKl8M="; + hash = "sha256-FIfuc1D5/7ZtYKtBdlGSUsKzcXYsvo+DQP2VH2OAEoA="; }; patches = [ From 354235fbff7b55b34db4a3e8cf2801412b83acf2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Jul 2023 07:36:31 +0000 Subject: [PATCH 17/35] velero: 1.11.0 -> 1.11.1 --- pkgs/applications/networking/cluster/velero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 3690464cebbe..9092dfb30739 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-vrRVNVcNahTC+HSHr7Bw3WedNhe+SSX03P65C5xiUnw="; + sha256 = "sha256-G1+zdzHj8fDKVEVQpBEH3o/em+gxCyQmrpSXj8bE/P4="; }; ldflags = [ From 6f22451e6590751214018204f34b732bbc8efd8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Jul 2023 08:52:00 +0000 Subject: [PATCH 18/35] python310Packages.smart-meter-texas: 0.5.1 -> 0.5.3 --- .../python-modules/smart-meter-texas/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/smart-meter-texas/default.nix b/pkgs/development/python-modules/smart-meter-texas/default.nix index d7d568602358..bd0d181a3ede 100644 --- a/pkgs/development/python-modules/smart-meter-texas/default.nix +++ b/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "smart-meter-texas"; - version = "0.5.1"; + version = "0.5.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "grahamwetzler"; repo = "smart-meter-texas"; - rev = "v${version}"; - hash = "sha256-rjMRV5MekwRkipes2nWos/1zi3sD+Ls8LyD3+t5FOZc="; + rev = "refs/tags/v${version}"; + hash = "sha256-8htd5fLrtkaVlSEm+RB7tWA5YZkcAOjAXVNzZiMwP7k="; }; postPatch = '' From f633f5965a6dba7c2fe2c4e0b4b46b9a3b68cfac Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Fri, 16 Jun 2023 17:15:23 +1000 Subject: [PATCH 19/35] ruby_3_3: init at 3.3.0.preview1 --- pkgs/development/interpreters/ruby/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 4091fc7dc8d8..73c3a9b8bfb6 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -349,4 +349,11 @@ in { sha256 = "sha256-lsV1WIcaZ0jeW8nydOk/S1qtBs2PN776Do2U57ikI7w="; cargoSha256 = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ="; }; + + ruby_3_3 = generic { + version = rubyVersion "3" "3" "0" "preview1"; + sha256 = "sha256-w0VKkRd5uNdHqw6ocEEDDQAtUz7ayySF/lWLcITaJe0="; + cargoSha256 = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ="; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index faec8b71c97f..3466bbe8f419 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17852,7 +17852,8 @@ with pkgs; ruby_2_7 ruby_3_0 ruby_3_1 - ruby_3_2; + ruby_3_2 + ruby_3_3; ruby = ruby_3_1; rubyPackages = rubyPackages_3_1; @@ -17861,6 +17862,7 @@ with pkgs; rubyPackages_3_0 = recurseIntoAttrs ruby_3_0.gems; rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems; rubyPackages_3_2 = recurseIntoAttrs ruby_3_2.gems; + rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems; mruby = callPackage ../development/compilers/mruby { }; From d7f26a8484ea5f59677ec1a99c1f11fbcf879a08 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 30 Jul 2023 12:44:40 +0000 Subject: [PATCH 20/35] =?UTF-8?q?gspell:=201.12.1=20=E2=86=92=201.12.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gspell/-/compare/1.12.1...1.12.2 --- pkgs/development/libraries/gspell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index d3ddb25ed0e9..fa7eb93fe0c6 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "gspell"; - version = "1.12.1"; + version = "1.12.2"; outputs = [ "out" "dev" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "jsRPMgUuiW/N1JJuuBSjJuOaUEfiUe7HuQVvvZREsPE="; + sha256 = "tOmTvYJ+TOtqdwsbXolQ/OO+nIsrDL6yL9+ZKAjdITk="; }; patches = [ From d02bcaf5f1c023b5f28156c60438f535c05979a9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 30 Jul 2023 12:47:47 +0000 Subject: [PATCH 21/35] =?UTF-8?q?epiphany:=2044.5=20=E2=86=92=2044.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/44.5...44.6 --- pkgs/desktops/gnome/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index ee31ca4fa565..8e396cc3f95d 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "44.5"; + version = "44.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PEdeBO0qD0EMtEuWk3VjaXB5GTrJt6UMkUhfubCDFas="; + sha256 = "UzXdVzWB22HhJthU3BauUZZXpbh5B4mkfSXkPhfNOkM="; }; nativeBuildInputs = [ From f06933def61c358004dd55263a9b88ee6c4f2397 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 30 Jul 2023 12:48:32 +0000 Subject: [PATCH 22/35] =?UTF-8?q?xdg-desktop-portal-gnome:=2044.1=20?= =?UTF-8?q?=E2=86=92=2044.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/compare/44.1...44.2 --- .../libraries/xdg-desktop-portal-gnome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index 766f944f15a1..c25bc2f512ba 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gnome"; - version = "44.1"; + version = "44.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NoLFRsgZIqW6adYthvacDCaxfJCWgj9YFJ0LVbvw7ts="; + sha256 = "UO0arCkDA+oLxchAqcEWWRhUarSnOiTFLcqicHK1/yE="; }; nativeBuildInputs = [ From d0d2424bc04ff8af1cbdb4128735ac078b6c3e53 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 15 Mar 2023 20:04:22 +0100 Subject: [PATCH 23/35] to-html: init at 0.1.4 --- pkgs/tools/text/to-html/default.nix | 30 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/text/to-html/default.nix diff --git a/pkgs/tools/text/to-html/default.nix b/pkgs/tools/text/to-html/default.nix new file mode 100644 index 000000000000..0b49fd8be2b1 --- /dev/null +++ b/pkgs/tools/text/to-html/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + version = "0.1.4"; + pname = "to-html"; + + src = fetchFromGitHub { + owner = "Aloso"; + repo = "to-html"; + rev = "v${version}"; + hash = "sha256-zkTBjsMFhRz7lVRh8i+XkaJ/qWmTAMPnkH5aDhbHf8U="; + }; + + cargoHash = "sha256-hXc+lB3DKnRZkp1U5wW/vPKSZ0c1UknQCAxDfE7Eubg="; + + # Requires external resources + doCheck = false; + + meta = { + description = "Terminal wrapper for rendering a terminal on a website by converting ANSI escape sequences to HTML."; + homepage = "https://github.com/Aloso/to-html"; + changelog = "https://github.com/Aloso/to-html/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ icewind1991 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ef9a60908ad..ecae4e4bdb92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13422,6 +13422,8 @@ with pkgs; tncattach = callPackage ../applications/radio/tncattach { }; + to-html = callPackage ../tools/text/to-html { }; + toilet = callPackage ../tools/misc/toilet { }; tokei = callPackage ../development/tools/misc/tokei { From a0c846a05ad76b7f36c6672988175984285f7849 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 30 Jul 2023 21:24:49 +0800 Subject: [PATCH 24/35] nixos/test-driver: format There is a `black --check --diff ${src}/test_driver` check in nixos-test-driver's checkPhase so this format change will be needed. --- nixos/lib/test-driver/test_driver/machine.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index da27e8759050..809fd690d717 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -833,7 +833,9 @@ class Machine: # TODO: do we want to bail after a set number of attempts? while not shell_ready(timeout_secs=30): self.log("Guest root shell did not produce any data yet...") - self.log(" To debug, enter the VM and run 'systemctl status backdoor.service'.") + self.log( + " To debug, enter the VM and run 'systemctl status backdoor.service'." + ) while True: chunk = self.shell.recv(1024) From 7fae0116199ee909c0f877619edd91f9bd32d9a3 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sun, 30 Jul 2023 15:39:37 +0200 Subject: [PATCH 25/35] linux_testing: 6.5-rc2 -> 6.5-rc3 https://lwn.net/Articles/939013/ --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 28c056092ff8..0851a72e010d 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.5-rc2"; + version = "6.5-rc3"; extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchzip { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-QP7xCXl4tNppEH9Rso64n9GJ/SBGDtjA8d1TghTtKfA="; + hash = "sha256-z4y4eNkY458rxebey3eCG0CUDLJP9oQETVlH8Av3Lhs="; }; # Should the testing kernels ever be built on Hydra? From a865d875b8fb981b56b8d4ac533a1dcb700d1a4d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 29 Jul 2023 23:03:11 -0300 Subject: [PATCH 26/35] spigot: 20210527 -> 20220606.eb585f8 --- pkgs/tools/misc/spigot/default.nix | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/misc/spigot/default.nix b/pkgs/tools/misc/spigot/default.nix index b2abec09741d..5f50307537b6 100644 --- a/pkgs/tools/misc/spigot/default.nix +++ b/pkgs/tools/misc/spigot/default.nix @@ -8,14 +8,13 @@ , perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spigot"; - version = "20210527"; - srcVersion = "20210527.7dd3cfd"; + version = "20220606.eb585f8"; src = fetchurl { - url = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/${pname}-${srcVersion}.tar.gz"; - hash = "sha256-EBS3lgfLtsyBQ8mzoJPyZhRBJNmkVSeF5XecGgcvqtw="; + url = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/spigot-${finalAttrs.version}.tar.gz"; + hash = "sha256-JyNNZo/HUPWv5rYtlNYp8Hl0C7i3yxEyKm+77ysN7Ao="; }; nativeBuildInputs = [ @@ -33,22 +32,11 @@ stdenv.mkDerivation rec { strictDeps = true; - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - [ `$out/bin/spigot -b 10 -d 10 e` == "2.7182818284" ] || exit 1 - [ `$out/bin/spigot -b 10 -d 10 pi` == "3.1415926535" ] || exit 1 - [ `$out/bin/spigot -b 10 -d 10 sqrt\(2\)` == "1.4142135623" ] || exit 1 - - runHook postInstallCheck - ''; - - meta = with lib; { + meta = { homepage = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/"; description = "A command-line exact real calculator"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres mcbeth ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) From db62d26e0eab2cd3b74f13c02f1bbfbcd8e303d0 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 30 Jul 2023 11:58:21 -0400 Subject: [PATCH 27/35] starship: 1.15.0 -> 1.16.0 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 1100a62b0947..fa88b633d219 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - hash = "sha256-aINiWzkt4sAWgcGdkHTb2KRMh2z+LiOhDdTJbzbXwR4="; + hash = "sha256-CrD65nHE40n83HO+4QM1sLHvdFaqTvOb96hPBgXKuwk="; }; nativeBuildInputs = [ installShellFiles cmake ]; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/starship completions zsh) ''; - cargoHash = "sha256-XT2kgiITtG1FNyztNvos/r01pvdF1xPhHA4+YhFGFEU="; + cargoHash = "sha256-ZHHrpepKZnSGufyEAjNDozaIKAt2GFRt+hU2ej7LceA="; nativeCheckInputs = [ git ]; From 3084745ef41566278da2159e9d18c224b0023b68 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Jul 2023 18:13:28 +0200 Subject: [PATCH 28/35] amass: 4.0.4 -> 4.1.0 Diff: https://github.com/OWASP/Amass/compare/refs/tags/v4.0.4...v4.1.0 Changelog: https://github.com/OWASP/Amass/releases/tag/v4.1.0 --- pkgs/tools/networking/amass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 1855fa534130..92655b27eeb2 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "4.0.4"; + version = "4.1.0"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "refs/tags/v${version}"; - hash = "sha256-KzMpe6pSPCNlk4fhZUZ1dvcj2Vgk8gHbEhVwlxOFKFg="; + hash = "sha256-mNoz9kVW+fwmur6SGWcpH9XYCYxasZJM0Bu4Bd4XMek="; }; - vendorHash = "sha256-YdHJMUgVNUAREmvBDQl8p5ESOmJykheaQSU6asyZ7qc="; + vendorHash = "sha256-rX84qTlvPyDWVvHmpIVCP50yy+m+s/VtffORL+G/3kg="; outputs = [ "out" From db1ccedc1299b2a39dc57fa2d5938116c9a04317 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 25 Jul 2023 01:23:38 +0900 Subject: [PATCH 29/35] python310Packages.opentelemetry-api: refactor To avoid breaking any package under the opentelemetry-python repository, we must synchronize their versions. Since opentelemetry-api is the central component of opentelemetry-python, I used it as the source for version, src, and meta. --- .../opentelemetry-api/default.nix | 11 +++++++---- .../default.nix | 18 +++++------------- .../default.nix | 18 +++++------------- .../default.nix | 18 +++++------------- .../opentelemetry-exporter-otlp/default.nix | 18 +++++------------- .../default.nix | 17 ++++------------- .../opentelemetry-proto/default.nix | 18 +++++------------- .../opentelemetry-sdk/default.nix | 19 +++++-------------- .../default.nix | 18 +++++------------- .../opentelemetry-test-utils/default.nix | 17 ++++------------- 10 files changed, 50 insertions(+), 122 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 5e2959849b84..1c546e54cf88 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -17,13 +17,15 @@ let version = "1.18.0"; disabled = pythonOlder "3.7"; + # to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python"; rev = "refs/tags/v${self.version}"; - hash = "sha256-h6XDzM29wYiC51S7OpBXvWFCfZ7DmIyGMG2pFjJV7pI="; - sparseCheckout = [ "/${self.pname}" ]; - } + "/${self.pname}"; + hash = "sha256-8xf4TqEkBeueejQBckFGwBNN4Gyo+/7/my6Z1Mnei5Q="; + }; + + sourceRoot = "source/opentelemetry-api"; format = "pyproject"; @@ -55,8 +57,9 @@ let passthru.tests.${self.pname} = self.overridePythonAttrs { doCheck = true; }; meta = with lib; { - homepage = "https://opentelemetry.io"; + homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-api"; description = "OpenTelemetry Python API"; + changelog = "https://github.com/open-telemetry/opentelemetry-python/releases/tag/${self.src.rev}"; license = licenses.asl20; maintainers = teams.deshaw.members; }; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix index 2cfd38f2d1b7..a786318a58ba 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix @@ -1,26 +1,20 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling +, opentelemetry-api , opentelemetry-proto , opentelemetry-sdk , opentelemetry-test-utils , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp-proto-common"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-HNlkbDyYnr0/lDeY1xt0pRxqk+977ljgPdfJzAxL3AQ="; - sparseCheckout = [ "/exporter/${pname}" ]; - } + "/exporter/${pname}"; + sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-common"; format = "pyproject"; @@ -40,10 +34,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.common" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-common"; description = "OpenTelemetry Protobuf encoding"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix index 1b12b8f265ef..d4f2f4c4305b 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix @@ -1,29 +1,23 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , backoff , googleapis-common-protos , grpcio , hatchling +, opentelemetry-api , opentelemetry-test-utils , opentelemetry-exporter-otlp-proto-common , pytest-grpc , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp-proto-grpc"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-feAmPL/G3ABIY5tBODlMJIBzxqg6Bl7imJB2EYtEp2o="; - sparseCheckout = [ "/exporter/${pname}" ]; - } + "/exporter/${pname}"; + sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-grpc"; format = "pyproject"; @@ -49,10 +43,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.grpc" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-grpc"; description = "OpenTelemetry Collector Protobuf over gRPC Exporter"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix index ccf4cc7a2101..6d7bf23dafa3 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , backoff , googleapis-common-protos , hatchling +, opentelemetry-api , opentelemetry-exporter-otlp-proto-common , opentelemetry-test-utils , requests @@ -12,18 +12,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp-proto-http"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-r4jvIhRM9E4CuZyS/XvvYO+F9cPxip8ab57CUfip47Q="; - sparseCheckout = [ "/exporter/${pname}" ]; - } + "/exporter/${pname}"; + sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-http"; format = "pyproject"; @@ -46,10 +40,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.http" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-http"; description = "OpenTelemetry Collector Protobuf over HTTP Exporter"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix index 278298be1217..a3606148883f 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix @@ -1,26 +1,20 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , backoff , hatchling +, opentelemetry-api , opentelemetry-exporter-otlp-proto-grpc , opentelemetry-exporter-otlp-proto-http , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-ph9ahT6M8UBvuUJjk6nug68Ou/D7XuuXkfnKHEdD8x8="; - sparseCheckout = [ "/exporter/${pname}" ]; - } + "/exporter/${pname}"; + sourceRoot = "source/exporter/opentelemetry-exporter-otlp"; format = "pyproject"; @@ -39,10 +33,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.exporter.otlp" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp"; description = "OpenTelemetry Collector Exporters"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix index 003241d74c1c..1e74b3fd502f 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling , opentelemetry-api , opentelemetry-sdk @@ -10,18 +9,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-prometheus"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-vWVLUt3Ett04kqUyoTOBNvRj51/M35X83saBBxeOTZI="; - sparseCheckout = [ "/exporter/${pname}" ]; - } + "/exporter/${pname}"; + sourceRoot = "source/exporter/opentelemetry-exporter-prometheus"; format = "pyproject"; @@ -42,10 +35,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.exporter.prometheus" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-prometheus"; description = "Prometheus Metric Exporter for OpenTelemetry"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/pkgs/development/python-modules/opentelemetry-proto/default.nix b/pkgs/development/python-modules/opentelemetry-proto/default.nix index b3df8b893989..c673dee3986b 100644 --- a/pkgs/development/python-modules/opentelemetry-proto/default.nix +++ b/pkgs/development/python-modules/opentelemetry-proto/default.nix @@ -1,24 +1,18 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling +, opentelemetry-api , protobuf , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-proto"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-6iB+QlBUqRvIJ9p38NYgP4icW2rYs1P3bNCxI95cOvs="; - sparseCheckout = [ "/${pname}" ]; - } + "/${pname}"; + sourceRoot = "source/opentelemetry-proto"; format = "pyproject"; @@ -36,10 +30,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.proto" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-proto"; description = "OpenTelemetry Python Proto"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/pkgs/development/python-modules/opentelemetry-sdk/default.nix b/pkgs/development/python-modules/opentelemetry-sdk/default.nix index 6ac7b8037fb7..1b4683137d95 100644 --- a/pkgs/development/python-modules/opentelemetry-sdk/default.nix +++ b/pkgs/development/python-modules/opentelemetry-sdk/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , flaky , hatchling , opentelemetry-api @@ -14,17 +13,11 @@ let self = buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-sdk"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${self.version}"; - hash = "sha256-YMFSmzuvm/VA9Fpe7pbF9mnGQHOQpobWMb1iGRt+d3w="; - sparseCheckout = [ "/${self.pname}" ]; - } + "/${self.pname}"; + sourceRoot = "source/opentelemetry-sdk"; format = "pyproject"; @@ -56,11 +49,9 @@ let # Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils. passthru.tests.${self.pname} = self.overridePythonAttrs { doCheck = true; }; - meta = with lib; { - homepage = "https://opentelemetry.io"; - description = "OpenTelemetry Python API and SDK"; - license = licenses.asl20; - maintainers = teams.deshaw.members; + meta = opentelemetry-api.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-sdk"; + description = "OpenTelemetry Python SDK"; }; }; in self diff --git a/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix b/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix index d9743975bf6c..0ae9fb34d06f 100644 --- a/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix +++ b/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix @@ -1,23 +1,17 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling +, opentelemetry-api , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-semantic-conventions"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-82L/tDoWgu0r+Li3CS3hjVR99DQQmA5yt3y85+37imI="; - sparseCheckout = [ "/${pname}" ]; - } + "/${pname}"; + sourceRoot = "source/opentelemetry-semantic-conventions"; format = "pyproject"; @@ -31,10 +25,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.semconv" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-semantic-conventions"; description = "OpenTelemetry Semantic Conventions"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix index 0f78e511a885..71e87b0737a9 100644 --- a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix +++ b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix @@ -2,25 +2,18 @@ , callPackage , buildPythonPackage , pythonOlder -, fetchFromGitHub , asgiref , hatchling , opentelemetry-api , opentelemetry-sdk }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-test-utils"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-WRcKTE3eVqOSQUi5gZ3du+RGw8CrMazXHrctdrjgzHo="; - sparseCheckout = [ "/tests/${pname}" ]; - } + "/tests/${pname}"; + sourceRoot = "source/tests/opentelemetry-test-utils"; format = "pyproject"; @@ -36,10 +29,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.test" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/tests/opentelemetry-test-utils"; description = "Test utilities for OpenTelemetry unit tests"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } From 35a8ff1d1d6e4e11529c07a9753f39ca4a0f1044 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 25 Jul 2023 01:39:31 +0900 Subject: [PATCH 30/35] python310Packages.opentelemetry-api: add natsukium as maintainer --- pkgs/development/python-modules/opentelemetry-api/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 1c546e54cf88..2a4de0a92cc9 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -61,7 +61,7 @@ let description = "OpenTelemetry Python API"; changelog = "https://github.com/open-telemetry/opentelemetry-python/releases/tag/${self.src.rev}"; license = licenses.asl20; - maintainers = teams.deshaw.members; + maintainers = teams.deshaw.members ++ [ maintainers.natsukium ]; }; }; in self From 86200041e2aeb4f4e43c9413713295a907e3855e Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 30 Jul 2023 09:07:55 +0900 Subject: [PATCH 31/35] python310Packages.opentelemetry-instrumentation: refactor To avoid breaking any package under the opentelemetry-python-contrib repository, we must synchronize their versions. Since opentelemetry-instrumentation is the central component of opentelemetry-python-contrib, I used it as the source for version, src, and meta. --- .../default.nix | 21 +++++-------------- .../default.nix | 17 ++++----------- .../default.nix | 17 ++++----------- .../default.nix | 17 ++++----------- .../default.nix | 17 ++++----------- .../opentelemetry-instrumentation/default.nix | 9 +++++--- .../opentelemetry-util-http/default.nix | 17 ++++----------- 7 files changed, 31 insertions(+), 84 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix index 379b5a608ae3..de0823c0aac9 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling , opentelemetry-api , opentelemetry-instrumentation @@ -12,21 +11,13 @@ , pytestCheckHook , aiohttp }: -let - pname = "opentelemetry-instrumentation-aiohttp-client"; - version = "0.39b0"; -in + buildPythonPackage { - inherit pname version; + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-aiohttp-client"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-HFDebR3d1osFAIlNuIbs5s+uPeTTJ1xkz+BpE5BpciU="; - sparseCheckout = [ "/instrumentation/${pname}" ]; - } + "/instrumentation/${pname}"; + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-aiohttp-client"; format = "pyproject"; @@ -54,10 +45,8 @@ buildPythonPackage { pythonImportsCheck = [ "opentelemetry.instrumentation.aiohttp_client" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-aiohttp-client"; description = "OpenTelemetry Instrumentation for aiohttp-client"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; }; } diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix index 3fb18175ab22..5777498873b7 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , asgiref , hatchling , opentelemetry-api @@ -12,18 +11,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-asgi"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-BfNrbOQwyApdcKOVGF0LqzWOxzLkHZYiYdYVVPkGmdQ="; - sparseCheckout = [ "/instrumentation/${pname}" ]; - } + "/instrumentation/${pname}"; + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-asgi"; format = "pyproject"; @@ -46,10 +39,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation.asgi" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-asgi"; description = "ASGI instrumentation for OpenTelemetry"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix index 2d8536a9037d..ec19eacf0e3d 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , django , hatchling , opentelemetry-api @@ -14,18 +13,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-django"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-5tyLFQTYuJBFAFZirqsaHXCw72Q3TigDctZZFi/2zdI="; - sparseCheckout = [ "/instrumentation/${pname}" ]; - } + "/instrumentation/${pname}"; + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-django"; format = "pyproject"; @@ -50,10 +43,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation.django" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-django"; description = "OpenTelemetry Instrumentation for Django"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix index abeed7f05882..8313faa8d6dd 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling , opentelemetry-api , opentelemetry-instrumentation @@ -13,18 +12,12 @@ , grpcio }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-grpc"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-DkDAE0MsF9HdywxlFzqJaqNor4O/jpnSqINsKTuiVqU="; - sparseCheckout = [ "/instrumentation/${pname}" ]; - } + "/instrumentation/${pname}"; + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-grpc"; format = "pyproject"; @@ -52,10 +45,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation.grpc" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-grpc"; description = "OpenTelemetry Instrumentation for grpc"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; }; } diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix index b50674ea1b68..408cfb692329 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling , opentelemetry-api , opentelemetry-instrumentation @@ -11,18 +10,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-wsgi"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-DBZGXY8Y208YC/guk0qUB04UA/JFAtiv3kjsikskTRs="; - sparseCheckout = [ "/instrumentation/${pname}" ]; - } + "/instrumentation/${pname}"; + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-wsgi"; format = "pyproject"; @@ -44,10 +37,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation.wsgi" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-wsgi"; description = "WSGI Middleware for OpenTelemetry"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 140ca386554c..c47b211a139c 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -16,13 +16,15 @@ buildPythonPackage rec { version = "0.39b0"; disabled = pythonOlder "3.7"; + # to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-+zk76A640nyd1L0I55JrMMs7EnQ+SPQdYGAFIyQFc6E="; - sparseCheckout = [ "/${pname}" ]; - } + "/${pname}"; + hash = "sha256-MPBOdurEQhA9BPRgVftejjtkvN/zRQEJDjQcS2QW3xc="; + }; + + sourceRoot = "source/opentelemetry-instrumentation"; format = "pyproject"; @@ -47,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation"; description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python"; + changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = teams.deshaw.members; }; diff --git a/pkgs/development/python-modules/opentelemetry-util-http/default.nix b/pkgs/development/python-modules/opentelemetry-util-http/default.nix index ddd25dccb784..49ec52a380b0 100644 --- a/pkgs/development/python-modules/opentelemetry-util-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-util-http/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling , opentelemetry-instrumentation , opentelemetry-sdk @@ -10,18 +9,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-util-http"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-C20/M5wimQec/8tTKx7+jkIYgfgNPtU9lkPKliIM3Uk="; - sparseCheckout = [ "/util/${pname}" ]; - } + "/util/${pname}"; + sourceRoot = "source/util/opentelemetry-util-http"; format = "pyproject"; @@ -42,10 +35,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.util.http" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/util/opentelemetry-util-http"; description = "Web util for OpenTelemetry"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } From 29a702dfa6f8ff418ebc484a8e7411ea29a66e21 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 30 Jul 2023 09:21:09 +0900 Subject: [PATCH 32/35] python310Packages.opentelemetry-instrumentation: add natsukium as maintainer --- .../python-modules/opentelemetry-instrumentation/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index c47b211a139c..8716ef4efede 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python"; changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/${src.rev}"; license = licenses.asl20; - maintainers = teams.deshaw.members; + maintainers = teams.deshaw.members ++ [ maintainers.natsukium ]; }; } From 5acfaa6f64afae20f101ba20241aca5521b6434a Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 30 Jul 2023 10:25:26 +0900 Subject: [PATCH 33/35] python310Packages.gptcache: init at 0.1.37 --- .../python-modules/gptcache/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/gptcache/default.nix diff --git a/pkgs/development/python-modules/gptcache/default.nix b/pkgs/development/python-modules/gptcache/default.nix new file mode 100644 index 000000000000..9fd2c80c3c49 --- /dev/null +++ b/pkgs/development/python-modules/gptcache/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cachetools +, numpy +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "gptcache"; + version = "0.1.37"; + format = "setuptools"; + + disabled = pythonOlder "3.8.1"; + + src = fetchFromGitHub { + owner = "zilliztech"; + repo = "GPTCache"; + rev = "refs/tags/${version}"; + hash = "sha256-eQu3O6jPL1BRObA99XA2EOznn9NaArVRouqD1Ypz/4w="; + }; + + propagatedBuildInputs = [ + cachetools + numpy + requests + ]; + + # many tests require network access and complicated dependencies + doCheck = false; + + pythonImportsCheck = [ "gptcache" ]; + + meta = with lib; { + description = "Semantic cache for LLMs and fully integrated with LangChain and llama_index"; + homepage = "https://github.com/zilliztech/GPTCache"; + changelog = "https://github.com/zilliztech/GPTCache/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4b058cd18b8..c6f35a46b6b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4456,6 +4456,8 @@ self: super: with self; { gpt-2-simple = callPackage ../development/python-modules/gpt-2-simple { }; + gptcache = callPackage ../development/python-modules/gptcache { }; + gql = callPackage ../development/python-modules/gql { }; grad-cam = callPackage ../development/python-modules/grad-cam { }; From 230def9fe4fb0ab07562d11d9d0a14fc4f9bf697 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 30 Jul 2023 10:45:27 +0900 Subject: [PATCH 34/35] python310Packages.guidance: init at 0.0.64 --- .../python-modules/guidance/default.nix | 80 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 82 insertions(+) create mode 100644 pkgs/development/python-modules/guidance/default.nix diff --git a/pkgs/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix new file mode 100644 index 000000000000..7cd557d394ef --- /dev/null +++ b/pkgs/development/python-modules/guidance/default.nix @@ -0,0 +1,80 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, aiohttp +, diskcache +, gptcache +, msal +, nest-asyncio +, numpy +, openai +, platformdirs +, pygtrie +, pyparsing +, requests +, tiktoken +, torch +}: + +buildPythonPackage rec { + pname = "guidance"; + version = "0.0.64"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "guidance"; + rev = "refs/tags/${version}"; + hash = "sha256-tQpDJprxctKI88F+CZ9aSJbVo7tjmI4+VrI+WO4QlxE="; + }; + + propagatedBuildInputs = [ + aiohttp + diskcache + gptcache + msal + nest-asyncio + numpy + openai + platformdirs + pygtrie + pyparsing + requests + tiktoken + ]; + + nativeCheckInputs = [ + pytestCheckHook + torch + ]; + + disabledTests = [ + # require network access + "test_each_parallel_with_gen_openai" + ]; + + disabledTestPaths = [ + # require network access + "tests/library/test_gen.py" + "tests/library/test_include.py" + "tests/library/test_select.py" + "tests/llms/test_openai.py" + "tests/llms/test_transformers.py" + "tests/test_program.py" + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + pythonImportsCheck = [ "guidance" ]; + + meta = with lib; { + description = "A guidance language for controlling large language models"; + homepage = "https://github.com/microsoft/guidance"; + changelog = "https://github.com/microsoft/guidance/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c6f35a46b6b6..292c65543f62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4583,6 +4583,8 @@ self: super: with self; { gudhi = callPackage ../development/python-modules/gudhi { }; + guidance = callPackage ../development/python-modules/guidance { }; + gumath = callPackage ../development/python-modules/gumath { }; gunicorn = callPackage ../development/python-modules/gunicorn { }; From ff9296f93e39cfa2ec9b12268f2c280ab3c14b65 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt <104593071+osnyx@users.noreply.github.com> Date: Sun, 30 Jul 2023 18:49:54 +0200 Subject: [PATCH 35/35] nixos/gitlab: ensure service started again after dependency restarts (#245240) When a dependency, like postgresql.service or redis-gitlab.service, had been stopped and started at switch-to-configuration time, gitlab.service and its helper units had been stopped but not started again. `multi-user.target` only has a `Wants` relation to gitlab.target, but once gitlab.target has been successfully started once and is not stopped/ restarted again, it does not cause all its dependencies to stay activated the whole time. This commit fixes this by upgrading the dependy relationship of gitlab.service towards gitlab.target from a "Wants" to a "Requires". It should be enough to do this for this single unit part of gitlab.target only, as all other units wantedBy gitlab.target are pulled in by gitlab.service as well or have bindsTo relations. --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index a497fbb300d6..c5e38b498829 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1635,7 +1635,7 @@ in { "gitlab-config.service" "gitlab-db-config.service" ] ++ optional (cfg.databaseHost == "") "postgresql.service"; - wantedBy = [ "gitlab.target" ]; + requiredBy = [ "gitlab.target" ]; partOf = [ "gitlab.target" ]; environment = gitlabEnv; path = with pkgs; [