diff options
56 files changed, 490 insertions, 394 deletions
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index e1242276a74d4..81a5ea1750dec 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -109,8 +109,10 @@ let nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; }; + withExtraArgs = nixosSystem: nixosSystem // { + inherit extraArgs; + inherit (nixosSystem._module.args) pkgs; + extendModules = args: withExtraArgs (nixosSystem.extendModules args); + }; in -withWarnings nixosWithUserModules // { - inherit extraArgs; - inherit (nixosWithUserModules._module.args) pkgs; -} +withWarnings (withExtraArgs nixosWithUserModules) diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index 789dee101f0ca..809fd690d7173 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -833,6 +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'." + ) while True: chunk = self.shell.recv(1024) diff --git a/nixos/modules/services/matrix/appservice-irc.nix b/nixos/modules/services/matrix/appservice-irc.nix index 5526df785c356..8883d604b2eae 100644 --- a/nixos/modules/services/matrix/appservice-irc.nix +++ b/nixos/modules/services/matrix/appservice-irc.nix @@ -215,7 +215,10 @@ in { LockPersonality = true; RestrictRealtime = true; PrivateMounts = true; - SystemCallFilter = "~@aio @clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @setuid @swap"; + SystemCallFilter = [ + "@system-service @pkey" + "~@privileged @resources" + ]; SystemCallArchitectures = "native"; # AF_UNIX is required to connect to a postgres socket. RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index a497fbb300d63..c5e38b4988298 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; [ diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index fa166051db61e..f6d797a4f83f0 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -7,6 +7,7 @@ , pkg-config , ninja , alsa-lib +, alsa-plugins , freetype , libjack2 , lame @@ -85,6 +86,8 @@ in stdenv'.mkDerivation rec { qtWrapperArgs = [ # MuseScore JACK backend loads libjack at runtime. "--prefix ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}" + ] ++ lib.optionals (stdenv.isLinux) [ + "--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib" ] ++ lib.optionals (!stdenv.isDarwin) [ # There are some issues with using the wayland backend, see: # https://musescore.org/en/node/321936 diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 01f17bb41b956..834ab6198a87e 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -17,19 +17,17 @@ , wrapQtAppsHook , zlib , withTeXLive ? true +, buildPackages }: stdenv.mkDerivation rec { pname = "ipe"; - version = "7.2.26"; + version = "7.2.27"; src = fetchurl { url = "https://github.com/otfried/ipe/releases/download/v${version}/ipe-${version}-src.tar.gz"; - sha256 = "sha256-5J0AV5E6SlFrIBfwDZrbJnkDUoVZ0fDH669s2RQ1CqU="; + sha256 = "sha256-wx/bZy8kB7dpZsz58BeRGdS1BzbrIoafgEmLyFg7wZU="; }; - patches = [ - ./headers-lookup.patch - ]; nativeBuildInputs = [ pkg-config copyDesktopItems wrapQtAppsHook ]; @@ -52,6 +50,7 @@ stdenv.mkDerivation rec { "-C src" "IPEPREFIX=${placeholder "out"}" "LUA_PACKAGE=lua" + "MOC=${buildPackages.qt6Packages.qtbase}/libexec/moc" "IPE_NO_SPELLCHECK=1" # qtSpell is not yet packaged ]; diff --git a/pkgs/applications/graphics/ipe/headers-lookup.patch b/pkgs/applications/graphics/ipe/headers-lookup.patch deleted file mode 100644 index a6adf1b164742..0000000000000 --- a/pkgs/applications/graphics/ipe/headers-lookup.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/ipepresenter/Makefile b/src/ipepresenter/Makefile -index ae3664e..f4f74ff 100644 ---- a/src/ipepresenter/Makefile -+++ b/src/ipepresenter/Makefile -@@ -8,7 +8,7 @@ include ../common.mak - - TARGET = $(call exe_target,ipepresenter) - --CXXFLAGS += -I../include -I../ipecanvas -I../ipecairo \ -+CPPFLAGS += -I../include -I../ipecanvas -I../ipecairo \ - $(UI_CFLAGS) $(CAIRO_CFLAGS) $(ZLIB_CFLAGS) - LIBS += -L$(buildlib) -lipecanvas -lipecairo -lipe \ - $(UI_LIBS) $(CAIRO_LIBS) $(ZLIB_LIBS) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 96e77baf30251..65c80cc81f1cf 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -70,7 +70,8 @@ mkDerivation rec { cmakeFlags = [ "-DAUTOSTART_EXEC_PATH=${autostartExecPath}" # See https://github.com/Martchus/syncthingtray/issues/42 - "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/lib/qt-5" + "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/${qtbase.qtPluginPrefix}" + "-DBUILD_SHARED_LIBS=ON" ] ++ lib.optionals (!plasmoidSupport) ["-DNO_PLASMOID=ON"] ++ lib.optionals (!kioPluginSupport) ["-DNO_FILE_ITEM_ACTION_PLUGIN=ON"] ++ lib.optionals systemdSupport ["-DSYSTEMD_SUPPORT=ON"] diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 63811d27b7eb5..11165cbc8fb6d 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.242"; + version = "1.2.248"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-cYEhqoCkJtBRQuQDViA+x5Ow5bUB5Y2lZZf18cm5ig8="; + hash = "sha256-z8XuMByI6B49XCgsZWVjErzcmthCCnpE6LdIfHEpxyA="; }; - vendorHash = "sha256-tNTjPIVfviUZ4ONDyQI3M+DIzZvvPbBPdVu0Du+PIdg="; + vendorHash = "sha256-mt/2Pc1xF6seMZiSxQFQ6bfUxpQCgG3WkjZd0utWbiw="; proxyVendor = true; diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index cf9ba51ffae1e..1cfa62ea6d47b 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 = [ diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index ee31ca4fa565d..8e396cc3f95d7 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 = [ diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix index c801199a72a8a..95050843d0730 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "kzones"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "gerritdevriese"; repo = "kzones"; rev = "v${version}"; - sha256 = "sha256-E5pi2ttar6bAt7s0m/NCw66Qgg5fL5p5QpXROWuUTvM="; + sha256 = "sha256-0f7Fv5cvRvqNrKjHpU/tLpjiBPN0ExwTDq1p9sdLd4o="; }; buildInputs = [ diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 45a87690e1972..c3731c0e7a759 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.isDarwin [ iconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4 ]; + + cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"]; + # Otherwise, tests fail since the resulting shared object libc++utilities.so is only available in PWD of the make files preCheck = '' checkFlagsArray+=( diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index d3ddb25ed0e9a..fa7eb93fe0c6c 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 = [ diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 9b866a26e6980..93ecaa698f7a0 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase cpp-utilities ]; nativeBuildInputs = [ cmake qttools ]; + cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"]; + dontWrapQtApps = true; meta = with lib; { diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index 766f944f15a1c..c25bc2f512ba8 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 = [ diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 6fadd434415ae..f65b3eb16cd7b 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; diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index e619732f329d5..674b456908b0e 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; diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 1082529bcc43e..cbd787a7c22e8 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; diff --git a/pkgs/development/python-modules/gptcache/default.nix b/pkgs/development/python-modules/gptcache/default.nix new file mode 100644 index 0000000000000..9fd2c80c3c491 --- /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/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix new file mode 100644 index 0000000000000..7cd557d394ef1 --- /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/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 9952ade339c43..bc9193ec51020 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 = [ diff --git a/pkgs/development/python-modules/mypy-boto3-ebs/default.nix b/pkgs/development/python-modules/mypy-boto3-ebs/default.nix index cb8348934340d..62b26ff2d21b6 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.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hBFD5BNZ0OaHwL4iMLPNA916dLUBHTBl2f18/iOPsTs="; + hash = "sha256-GhOEPhx4zD5jXyTMH75DOq0UL4LgOMkJn0U5nKciNMI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 864a136f7353e..5d9ad9c71af96 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 = [ diff --git a/pkgs/development/python-modules/nclib/default.nix b/pkgs/development/python-modules/nclib/default.nix index 244f49a48e5bd..e6db538859fc1 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 diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 5e2959849b84e..2a4de0a92cc98 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,10 +57,11 @@ 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; + maintainers = teams.deshaw.members ++ [ maintainers.natsukium ]; }; }; in self 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 2cfd38f2d1b79..a786318a58ba7 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 1b12b8f265efd..d4f2f4c4305b1 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 ccf4cc7a21013..6d7bf23dafa34 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 278298be12178..a3606148883f5 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 003241d74c1ca..1e74b3fd502fb 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-instrumentation-aiohttp-client/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix index 379b5a608ae32..de0823c0aac94 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 3fb18175ab22e..5777498873b77 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 2d8536a9037dd..ec19eacf0e3d6 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 abeed7f058820..8313faa8d6ddb 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 b50674ea1b68c..408cfb6923297 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 140ca386554c2..8716ef4efedec 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,7 +49,8 @@ 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; + maintainers = teams.deshaw.members ++ [ maintainers.natsukium ]; }; } diff --git a/pkgs/development/python-modules/opentelemetry-proto/default.nix b/pkgs/development/python-modules/opentelemetry-proto/default.nix index b3df8b893989e..c673dee3986bc 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 6ac7b8037fb7b..1b4683137d956 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 d9743975bf6ca..0ae9fb34d06f3 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 0f78e511a8852..71e87b0737a99 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; }; } diff --git a/pkgs/development/python-modules/opentelemetry-util-http/default.nix b/pkgs/development/python-modules/opentelemetry-util-http/default.nix index ddd25dccb7844..49ec52a380b05 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; }; } diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 4cd07a0249d88..7c7d36167feab 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 = [ diff --git a/pkgs/development/python-modules/potentials/default.nix b/pkgs/development/python-modules/potentials/default.nix index 87c374fd533ec..4cad316d2a662 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 = [ diff --git a/pkgs/development/python-modules/yabadaba/default.nix b/pkgs/development/python-modules/yabadaba/default.nix index c83b61bafe5df..bc8146a91489d 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 = [ diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile index b6cfd674cfcf5..30cd0f6b72b99 100644 --- a/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/pkgs/development/ruby-modules/with-packages/Gemfile @@ -128,6 +128,7 @@ gem 'rspec' gem 'rubocop' gem 'rubocop-performance' gem 'ruby-libvirt' +gem 'ruby-lsp' gem 'ruby-lxc' gem 'ruby-progressbar' gem 'ruby-terminfo' diff --git a/pkgs/development/tools/database/sqlcl/default.nix b/pkgs/development/tools/database/sqlcl/default.nix index ccf3bd4a23d3f..67d905ae0565c 100644 --- a/pkgs/development/tools/database/sqlcl/default.nix +++ b/pkgs/development/tools/database/sqlcl/default.nix @@ -1,17 +1,12 @@ { lib, stdenv, makeWrapper, requireFile, unzip, jdk }: -let - version = "22.4.0.342.1212"; - fileVersion = "1032835-01"; -in - stdenv.mkDerivation { - - inherit version; +stdenv.mkDerivation rec { pname = "sqlcl"; + version = "23.2.0.178.1027"; src = requireFile rec { url = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/download/"; - name = "V${fileVersion}.zip"; + name = "sqlcl-${version}.zip"; message = '' This Nix expression requires that ${name} already be part of the store. To obtain it you need to @@ -37,7 +32,7 @@ in nix-prefetch-url --type sha256 file:///path/to/${name} ''; - sha256 = "0i4xsj502s465fgmlcqn80r8rqzr11mv74x9fzrlbqmkkh5c782k"; + hash = "sha256-wGqLlV88yYJrVblKzeG6VerfsEgCi1JQd49ONZmUB4Y="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 042a9aa5a3bb9..3240fe93de199 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -715,7 +715,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 4e1c34d6ae4bd..0851a72e010d9 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-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-UDhLrKe8yMvmWbS19Xt1G3SQpAUWyKrfV3v1MJ5Vep8="; + hash = "sha256-z4y4eNkY458rxebey3eCG0CUDLJP9oQETVlH8Av3Lhs="; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/servers/audiobookshelf/default.nix b/pkgs/servers/audiobookshelf/default.nix index f44019bf7cc4d..748800f52ed62 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 diff --git a/pkgs/tools/misc/spigot/default.nix b/pkgs/tools/misc/spigot/default.nix index b2abec09741d8..5f50307537b63 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; }; -} +}) diff --git a/pkgs/tools/system/stacer/default.nix b/pkgs/tools/system/stacer/default.nix new file mode 100644 index 0000000000000..75068148bd74c --- /dev/null +++ b/pkgs/tools/system/stacer/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qtcharts +, qttools +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "stacer"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "oguzhaninan"; + repo = pname; + rev = "v${version}"; + sha256 = "0qndzzkbq6abapvwq202kva8j619jdn9977sbqmmfs9zkjz4mbsd"; + }; + + postPatch = '' + substituteInPlace stacer/Managers/app_manager.cpp \ + --replace 'qApp->applicationDirPath() + "/translations"' \ + 'QStandardPaths::locate(QStandardPaths::AppDataLocation, "translations", QStandardPaths::LocateDirectory)' + ''; + + buildInputs = [ + qtcharts + qttools + ]; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + preConfigure = '' + lrelease stacer/stacer.pro + ''; + + postInstall = '' + install -Dm644 ../translations/*.qm -t $out/share/stacer/translations + ''; + + meta = with lib; { + description = "Linux System Optimizer and Monitoring"; + homepage = "https://github.com/oguzhaninan/stacer"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dit7ya ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/text/to-html/default.nix b/pkgs/tools/text/to-html/default.nix new file mode 100644 index 0000000000000..0b49fd8be2b1f --- /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 ec60565827a8f..780b655cd1fac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12516,6 +12516,8 @@ with pkgs; rubocop = rubyPackages.rubocop; + ruby-lsp = rubyPackages.ruby-lsp; + runningx = callPackage ../tools/X11/runningx { }; rund = callPackage ../development/tools/rund { }; @@ -13208,6 +13210,8 @@ with pkgs; stabber = callPackage ../misc/stabber { }; + stacer = libsForQt5.callPackage ../tools/system/stacer { }; + starcharts = callPackage ../servers/misc/starcharts { }; staticjinja = with python3.pkgs; toPythonApplication staticjinja; @@ -13587,6 +13591,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 { @@ -32507,7 +32513,7 @@ with pkgs; lua = lua5_1; }; - ipe = libsForQt5.callPackage ../applications/graphics/ipe { + ipe = qt6Packages.callPackage ../applications/graphics/ipe { ghostscript = ghostscriptX; texlive = texlive.combine { inherit (texlive) scheme-small; }; lua5 = lua5_3; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4b058cd18b82..292c65543f62b 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 { }; @@ -4581,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 { }; diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 3fe149acae852..4d1b6136a859c 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "001cwsb6496wp8g0nkyjqxgmii63aljydq132yb2ksdp8ml5zlgj"; + sha256 = "1d72cqx1h9c0yl1vc8xakvji00krg118ih6lwqlg5nbw50gbx25c"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d990xy3jin8qa4l989r43kl5ykmi2kdlxqpnla10n5c7xp7xmci"; + sha256 = "12xkyfdpr7ljnd31yhc2kzl0rqrlwxzpg4qcn4yb2h364hwc6fh8"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "033981lhbq0vl8ppfpamqpqj3sq15x759899hvwli2imp3yw49r5"; + sha256 = "01x11ijfg56585vj7a7az0235idnxcnyjp1nb1jvkm08jjll5d1k"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w717izq6k7wl2j6zn4516kg2iwg3zgdzja6b6gpk6y5nccr04hw"; + sha256 = "0d66w1d9rhvafd0dilqyr1ymsvr060l8hi0xvwij7cyvzzxrlrbc"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bcpjhhbq6gl4h7hq2fianfz8vpdxf53gsj1ng04bkh5bxxrmrc1"; + sha256 = "0bpyfh8g0mzgkb8bxvf245mwnx1awbr1y6dxcdckyhsjjgrfynfl"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z0xvdal339w7jvk7a5py0c1q5xh588vqrilgxizkvzm3hwf48a2"; + sha256 = "1icfh9pgjpd29apzn07cnqa9nlpvjv7i4vrygack5gp7hp54l8m7"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18gsxi7vlg8y8k2fbhq44zd0mivjpnn4nrlfj037c7wvq5h8367v"; + sha256 = "1gawwb6550ra1xgbrki03aq4q5wafa3xfrpdr3cva4ghy3qqn53q"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; activemodel = { dependencies = ["activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cjbk1xl6jl2d6sczpxnr8da7zbmshmrghqhqdcwqqzl6chcy2si"; + sha256 = "072iv0d3vpbp0xijg4jj99sjil1rykmqfj9addxj76bm5mbzwcaj"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04x0bz3051linhmi52cfg31nsm4sgg27m7wp9p0cxrxdwc7q0bjl"; + sha256 = "1l0rn43bhyzlfa4wwcfz016vb4lkzvl0jf5zibkjy4sppxxixzrq"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mg236x3rkmdargkk9y6j9gqhkajzbk852gwnp1crp0difk7a4r8"; + sha256 = "036mv935r5mmh7fljz10lyr43c5y5bn8b6h7gdkv8spfgwzihw4j"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7k5i6531z5il4q1jnbrv7x7zcl3bgnxp5fzl71rzigk6zn53ym"; + sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; addressable = { dependencies = ["public_suffix"]; @@ -168,10 +168,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dk1dxz6rshll9hk33halpnfrab1gzr8dgrb4d1zdhw5n30k3zsa"; + sha256 = "0r3g92r9dnvbwklm8dx6w3ym8xhz90a2hs2sdarwhhydfyzxdcrj"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; atomos = { groups = ["default"]; @@ -260,10 +260,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v5j3szb30d0i5x9bx85bmqz028qcaxswifvhgh7qy1bby4j5mis"; + sha256 = "1vbq8gprb99anlxijc7hwamfvshd6w1k6kwwg5gs2c674nln1hqf"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; camping = { dependencies = ["mab" "rack"]; @@ -332,10 +332,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r5khhp71q1hysg2b541pdlw1fjrjibgfsfl7fcy8zm9hil9rrkb"; + sha256 = "0rn46vga5c1ww2vkf4dbg0w5g4h0vwx9idvdz3284188q4ksfbmg"; type = "gem"; }; - version = "3.5.3"; + version = "3.6.0"; }; cocoapods = { dependencies = ["addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; @@ -964,10 +964,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ai4cxnymjp7c2xqbfksks82aah0pbyjsl3r2cgc4iimrw2wg8qy"; + sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9"; type = "gem"; }; - version = "2.7.7"; + version = "2.7.10"; }; faraday-net_http = { groups = ["default"]; @@ -1100,10 +1100,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p9hyhfcdzp8ikidilwkiicz5zw2zpvmq7sa85bpf5sra82syvxg"; + sha256 = "0qr0dn4p3nrqnb8qjdlnsfhz80viv4fn86a450imabr76mr88fs3"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; gemoji = { groups = ["default"]; @@ -1131,10 +1131,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gpjg0d4f0l0fyx96h4djq6jsbd20ai65vbwh2f19359bpmad1yh"; + sha256 = "1jl1ng4db6iaa6yddvp69c61r7483kwvcr57hj3qm9pddkgf0bp0"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; git = { dependencies = ["addressable" "rchardet"]; @@ -1185,10 +1185,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19pwbfjc8px03jsh26sbsszrmhil3zbvkpq8cjm5953s8zc8yygl"; + sha256 = "00r3357m7fdvhsy1xi93bvvih4jgwf8lbg8dwrz2mggi1v6nh6n4"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; globalid = { dependencies = ["activesupport"]; @@ -1207,10 +1207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bgzjfzvb2fb04c5dfzyx3qsq0d8xz1hy24nidy6a7dbg88aj6hy"; + sha256 = "00lai12z92y6kidsrwnw0d386bwyzjrw0z07ifjxqn5zpyasgvkb"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1868,15 +1868,15 @@ version = "2.2.1"; }; jekyll-webmention_io = { - dependencies = ["htmlbeautifier" "jekyll" "json" "openssl" "string_inflection" "uglifier" "webmention"]; + dependencies = ["activesupport" "htmlbeautifier" "jekyll" "json" "jsonpath" "openssl" "uglifier" "webmention"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "003lwcl00l13c5r1i1zk5q1p8m50nv83w6h3j2mij6hs2aaz1zwb"; + sha256 = "0kkxvr1gfbmfbhy13syq4pqwmfqwhnbfcwjiqrwahf99gfcj5izh"; type = "gem"; }; - version = "3.3.7"; + version = "4.0.0"; }; jemoji = { dependencies = ["gemoji" "html-pipeline" "jekyll"]; @@ -1919,6 +1919,17 @@ }; version = "2.6.3"; }; + jsonpath = { + dependencies = ["multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xxklfvmwz8z6l08704x65gnq6r8r1pb9qk125qjbndnb1zz6fsp"; + type = "gem"; + }; + version = "1.0.7"; + }; jwt = { groups = ["default"]; platforms = []; @@ -2174,10 +2185,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; + sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.4"; }; minima = { dependencies = ["jekyll" "jekyll-feed" "jekyll-seo-tag"]; @@ -2195,10 +2206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb"; + sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; type = "gem"; }; - version = "5.18.1"; + version = "5.19.0"; }; molinillo = { groups = ["default"]; @@ -2215,10 +2226,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06n7556vxr3awh92xy1k5bli98bvq4pjm08mnl68ay4fzln7lcsg"; + sha256 = "1a5adcb7bwan09mqhj3wi9ib52hmdzmqg7q08pggn3adibyn5asr"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.2"; }; multi_json = { groups = ["default"]; @@ -2297,10 +2308,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k1qyjr9lkk5y3483k6wk6d9h1jx4v5hzby1mf0pj3b4kr2arxbm"; + sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; type = "gem"; }; - version = "0.3.6"; + version = "0.3.7"; }; net-pop = { dependencies = ["net-protocol"]; @@ -2382,10 +2393,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mr2ibfk874ncv0qbdkynay738w2mfinlkhnbd5lyk5yiw5q1p10"; + sha256 = "1jw8a20a9k05fpz3q24im19b97idss3179z76yn5scc5b8lk2rl7"; type = "gem"; }; - version = "1.15.2"; + version = "1.15.3"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -2468,10 +2479,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hak6b4j0xvq2n12wfmd8666284nwig3fgwi5chcirpp5c0mgj2h"; + sha256 = "1707vylw6yix9q92bpnvn5dflnywx5bh69awyirvn4g39p2yjc2b"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; parallel = { groups = ["default"]; @@ -2499,10 +2510,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "146x3jhipg55q9ig7l0x8sryanz1zfhai2vszmih7wmf8zi043gl"; + sha256 = "07jn3rndwfrqlziknhrqlvn523xb5kirnpbcmb4h4hw5npf67nii"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.2"; }; pastel = { dependencies = ["tty-color"]; @@ -2582,10 +2593,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pxk8pl4gmdmvm4jjhi8apwc23cyqs7rgp5bi4q2gi93k927w3x8"; + sha256 = "1y7p5712grf8sd4kmk9i62qs9mak2fd8685i78qv95wdz3g2csaa"; type = "gem"; }; - version = "3.2.2"; + version = "4.0.2"; }; prettier_print = { groups = ["default"]; @@ -2699,21 +2710,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zip0qhk7pp6cvrir77p6v76wj68zaqik875qr5rapqz9am2pvsp"; + sha256 = "08glp6jhq5yh8i5jjxzqa3aqx819l6ci6m68bx1asmimla0x9ysx"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; rails-dom-testing = { - dependencies = ["activesupport" "nokogiri"]; + dependencies = ["activesupport" "minitest" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + sha256 = "17g05y7q7934z0ib4aph8h71c2qwjmlakkm7nb2ab45q0aqkfgjd"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.1"; }; rails-html-sanitizer = { dependencies = ["loofah" "nokogiri"]; @@ -2732,10 +2743,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kn3cx00jnb7bjnh1k2q0dxk0r7nl1a0krgyk5ykxw1wcac81wyw"; + sha256 = "0dcabk5bl5flmspnb9d2qcvclcaw0nd5yr9w6m5pzsmylg3y63pv"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; rainbow = { groups = ["default"]; @@ -2824,10 +2835,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1habsrf67d3m5p12wc2bydsa7bj87r7w1266x8in59znf5wz4drf"; + sha256 = "00yryimbkm1k85n99f81n7cripkmh14459c9pmb7prl9nbiikkqc"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; red-colors = { dependencies = ["matrix"]; @@ -2931,10 +2942,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; rmagick = { dependencies = ["pkg-config"]; @@ -2942,10 +2953,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vcfjv6miia6qfnig2yqs42cwnj6jphi2llys7dsh4xykgcs6298"; + sha256 = "080h8755lks9395a2s4ijavzcsgp62367damj0dxif92jdayllzs"; type = "gem"; }; - version = "5.2.0"; + version = "5.3.0"; }; rouge = { groups = ["default"]; @@ -3006,20 +3017,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2"; + sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy"; type = "gem"; }; - version = "3.12.5"; + version = "3.12.6"; }; rspec-support = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; + sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.1"; }; rubocop = { dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -3027,10 +3038,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b7pf8916k7ps9jdnkn0774n37jpdzp88mzcqdij3h9hvpn6vr81"; + sha256 = "17c94wl2abqzf4fj469mdxzap1sd3410x421nl6mh2w49jsgvpki"; type = "gem"; }; - version = "1.53.0"; + version = "1.55.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -3086,6 +3097,17 @@ }; version = "0.8.0"; }; + ruby-lsp = { + dependencies = ["language_server-protocol" "sorbet-runtime" "syntax_tree"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iyxcr34p3hy7rjgrrlg6z9libiqy1als62rk3d37ixsbjdy6iyd"; + type = "gem"; + }; + version = "0.7.4"; + }; ruby-lxc = { groups = ["default"]; platforms = []; @@ -3247,10 +3269,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1brf6h0kg5ssl1sb99gv41y8lk814jqa3nzakb79ywlhyzbn1513"; + sha256 = "0zm5lfvhc1j7nq73s7i4g93kfbb3fg81jicf3sbfh2w5gm59nq7v"; type = "gem"; }; - version = "5.69.0"; + version = "5.70.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -3368,26 +3390,26 @@ }; version = "0.49.0"; }; - sqlite3 = { - dependencies = ["mini_portile2"]; + sorbet-runtime = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h95kr5529qv786mfk8r2jjdsdi6v7v3k3dpz69mrcc9i0vpdd37"; + sha256 = "0n197kk9nqf955lsphns835sbkz7wcgbpppad482iqx95bhf8i6l"; type = "gem"; }; - version = "1.6.3"; + version = "0.5.10932"; }; - string_inflection = { + sqlite3 = { + dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v57afc7rdr58xd6mayf9giifqgav3hqjr54kagi7iki3hn6vjag"; + sha256 = "0h95kr5529qv786mfk8r2jjdsdi6v7v3k3dpz69mrcc9i0vpdd37"; type = "gem"; }; - version = "0.1.2"; + version = "1.6.3"; }; syntax_tree = { dependencies = ["prettier_print"]; @@ -3635,10 +3657,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; + sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; websocket-extensions = { groups = ["default"]; @@ -3696,10 +3718,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; + sha256 = "0v14hl814knwi8pm2n09bpgcd107jafv4lnj9zmcsgfwbqxin3sq"; type = "gem"; }; - version = "2.6.8"; + version = "2.6.9"; }; zookeeper = { groups = ["default"]; |