nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 07:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-07-30 18:01:01 +00:00 committed by GitHub
commit 4168b4005a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
49 changed files with 347 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/lib/test-driver/test_driver/machine.py
View File

@ -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)

2
nixos/modules/services/misc/gitlab.nix
View File

@ -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; [

4
pkgs/applications/networking/cluster/velero/default.nix
View File

@ -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 = [

4
pkgs/applications/version-management/dvc/default.nix
View File

@ -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 = [

4
pkgs/desktops/gnome/core/epiphany/default.nix
View File

@ -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 = [

7
pkgs/development/interpreters/ruby/default.nix
View File

@ -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=";
};
}

4
pkgs/development/libraries/gspell/default.nix
View File

@ -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 = [

4
pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix
View File

@ -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 = [

4
pkgs/development/python-modules/dvc-data/default.nix
View File

@ -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;

4
pkgs/development/python-modules/dvc-objects/default.nix
View File

@ -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;

4
pkgs/development/python-modules/dvclive/default.nix
View File

@ -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;

42
pkgs/development/python-modules/gptcache/default.nix Normal file
View File

@ -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 ];
};
}

80
pkgs/development/python-modules/guidance/default.nix Normal file
View File

@ -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 ];
};
}

47
pkgs/development/python-modules/lektor/default.nix
View File

@ -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; {

4
pkgs/development/python-modules/mypy-boto3-builder/default.nix
View File

@ -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 = [

4
pkgs/development/python-modules/mypy-boto3-ebs/default.nix
View File

@ -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 = [

4
pkgs/development/python-modules/mypy-boto3-s3/default.nix
View File

@ -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 = [

4
pkgs/development/python-modules/nclib/default.nix
View File

@ -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

13
pkgs/development/python-modules/opentelemetry-api/default.nix
View File

@ -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

18
pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix
View File

@ -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;
};
}

18
pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix
View File

@ -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;
};
}

18
pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix
View File

@ -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;
};
}

18
pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix
View File

@ -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;
};
}

17
pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix
View File

@ -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;
};
}

21
pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix
View File

@ -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 ];
};
}

17
pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix
View File

@ -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;
};
}

17
pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix
View File

@ -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;
};
}

17
pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix
View File

@ -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 ];
};
}

17
pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix
View File

@ -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;
};
}

11
pkgs/development/python-modules/opentelemetry-instrumentation/default.nix
View File

@ -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 ];
};
}

18
pkgs/development/python-modules/opentelemetry-proto/default.nix
View File

@ -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;
};
}

19
pkgs/development/python-modules/opentelemetry-sdk/default.nix
View File

@ -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

18
pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix
View File

@ -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;
};
}

17
pkgs/development/python-modules/opentelemetry-test-utils/default.nix
View File

@ -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;
};
}

17
pkgs/development/python-modules/opentelemetry-util-http/default.nix
View File

@ -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;
};
}

4
pkgs/development/python-modules/plugwise/default.nix
View File

@ -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 = [

4
pkgs/development/python-modules/potentials/default.nix
View File

@ -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 = [

4
pkgs/development/python-modules/pyqt/6.x.nix
View File

@ -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 = [

6
pkgs/development/python-modules/smart-meter-texas/default.nix
View File

@ -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 = ''

4
pkgs/development/python-modules/yabadaba/default.nix
View File

@ -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 = [

2
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -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" = {

4
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@ -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?

11
pkgs/servers/audiobookshelf/default.nix
View File

@ -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

30
pkgs/tools/misc/spigot/default.nix
View File

@ -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;
};
}
})

6
pkgs/tools/misc/starship/default.nix
View File

@ -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 ];

6
pkgs/tools/networking/amass/default.nix
View File

@ -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"

30
pkgs/tools/text/to-html/default.nix Normal file
View File

@ -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 ];
};
}

6
pkgs/top-level/all-packages.nix
View File

@ -13591,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 {
@ -17856,7 +17858,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;
@ -17865,6 +17868,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 { };

4
pkgs/top-level/python-packages.nix
View File

@ -4458,6 +4458,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 { };
@ -4583,6 +4585,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 { };