ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 02:05:51 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2024-02-03 06:01:25 +00:00 committed by GitHub
commit 95ffc37024
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
22 changed files with 142 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/home-automation/zigbee2mqtt.nix
View File

@ -71,6 +71,7 @@ in
after = [ "network.target" ];
environment.ZIGBEE2MQTT_DATA = cfg.dataDir;
serviceConfig = {
Type = "notify";
ExecStart = "${cfg.package}/bin/zigbee2mqtt";
User = "zigbee2mqtt";
Group = "zigbee2mqtt";

1
nixos/tests/all-tests.nix
View File

@ -627,6 +627,7 @@ in {
ntfy-sh = handleTest ./ntfy-sh.nix {};
ntfy-sh-migration = handleTest ./ntfy-sh-migration.nix {};
ntpd-rs = handleTest ./ntpd-rs.nix {};
nvmetcfg = handleTest ./nvmetcfg.nix {};
nzbget = handleTest ./nzbget.nix {};
nzbhydra2 = handleTest ./nzbhydra2.nix {};
oh-my-zsh = handleTest ./oh-my-zsh.nix {};

43
nixos/tests/nvmetcfg.nix Normal file
View File

@ -0,0 +1,43 @@
import ./make-test-python.nix ({ lib, ... }: {
name = "nvmetcfg";
meta = {
maintainers = with lib.maintainers; [ nickcao ];
};
nodes = {
server = { pkgs, ... }: {
boot.kernelModules = [ "nvmet" ];
environment.systemPackages = [ pkgs.nvmetcfg ];
networking.firewall.allowedTCPPorts = [ 4420 ];
virtualisation.emptyDiskImages = [ 512 ];
};
client = { pkgs, ... }: {
boot.kernelModules = [ "nvme-fabrics" ];
environment.systemPackages = [ pkgs.nvme-cli ];
};
};
testScript = let subsystem = "nqn.2014-08.org.nixos:server"; in ''
import json
with subtest("Create subsystem and namespace"):
server.succeed("nvmet subsystem add ${subsystem}")
server.succeed("nvmet namespace add ${subsystem} 1 /dev/vdb")
with subtest("Bind subsystem to port"):
server.wait_for_unit("network-online.target")
server.succeed("nvmet port add 1 tcp 0.0.0.0:4420")
server.succeed("nvmet port add-subsystem 1 ${subsystem}")
with subtest("Discover and connect to available subsystems"):
client.wait_for_unit("network-online.target")
assert "subnqn: ${subsystem}" in client.succeed("nvme discover --transport=tcp --traddr=server --trsvcid=4420")
client.succeed("nvme connect-all --transport=tcp --traddr=server --trsvcid=4420")
with subtest("Write to the connected subsystem"):
devices = json.loads(client.succeed("lsblk --nvme --paths --json"))["blockdevices"]
assert len(devices) == 1
client.succeed(f"dd if=/dev/zero of={devices[0]['name']} bs=1M count=64")
'';
})

13
nixos/tests/zigbee2mqtt.nix
View File

@ -3,6 +3,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
name = "zigbee2mqtt";
nodes.machine = { pkgs, ... }:
{
systemd.services.dummy-serial = {
wantedBy = [
"multi-user.target"
];
serviceConfig = {
ExecStart = "${pkgs.socat}/bin/socat pty,link=/dev/ttyACM0,mode=666 pty,link=/dev/ttyACM1";
};
};
services.zigbee2mqtt = {
enable = true;
};
@ -11,10 +20,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
};
testScript = ''
machine.wait_for_unit("zigbee2mqtt.service")
machine.wait_for_unit("multi-user.target")
machine.wait_until_fails("systemctl status zigbee2mqtt.service")
machine.succeed(
"journalctl -eu zigbee2mqtt | grep \"Error: Error while opening serialport 'Error: Error: No such file or directory, cannot open /dev/ttyACM0'\""
"journalctl -eu zigbee2mqtt | grep 'Failed to connect to the adapter'"
)
machine.log(machine.succeed("systemd-analyze security zigbee2mqtt.service"))

4
pkgs/applications/virtualization/docker-slim/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-slim";
version = "1.40.10";
version = "1.40.11";
src = fetchFromGitHub {
owner = "slimtoolkit";
repo = "slim";
rev = version;
hash = "sha256-NpQyIOR8FkOgPHi3UwBAEpouJF/eaSAWD2zQ5dj+gAg=";
hash = "sha256-X+1euWp4W53axbiBpL82bUPfod/JNhGVGWgOqKyhz6A=";
};
vendorHash = null;

5
pkgs/by-name/nv/nvmetcfg/package.nix
View File

@ -1,6 +1,7 @@
{ lib
, rustPlatform
, fetchFromGitHub
, nixosTests
}:
rustPlatform.buildRustPackage rec {
@ -16,6 +17,10 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-yZ4UAx95f/cjeObBtzpiYtwDjgOgkKnD64yGe6ouVGw=";
passthru.tests = {
inherit (nixosTests) nvmetcfg;
};
meta = with lib; {
description = "NVMe-oF Target Configuration Utility for Linux";
homepage = "https://github.com/vifino/nvmetcfg";

4
pkgs/desktops/budgie/budgie-desktop/default.nix
View File

@ -37,14 +37,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "budgie-desktop";
version = "10.9";
version = "10.9.1";
src = fetchFromGitHub {
owner = "BuddiesOfBudgie";
repo = "budgie-desktop";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-yyuLBzTDEQH7rBOWTYBvS+3x2mlbF34f7U7oOUO8BeA=";
hash = "sha256-H+J/zFUjiXbr5ynDkkjrRsEbyO4LPOhqe8DdG60ikRw=";
};
patches = [

12
pkgs/development/cuda-modules/generic-builders/multiplex.nix
View File

@ -83,13 +83,13 @@ let
# perSystemReleases :: List Package
allReleases = lib.pipe releaseSets
[
(builtins.attrValues)
(lib.attrValues)
(lists.flatten)
(builtins.groupBy (p: lib.versions.majorMinor p.version))
(builtins.mapAttrs (_: builtins.sort preferable))
(builtins.mapAttrs (_: lib.take 1))
(builtins.attrValues)
(builtins.concatMap lib.trivial.id)
(lib.groupBy (p: lib.versions.majorMinor p.version))
(lib.mapAttrs (_: builtins.sort preferable))
(lib.mapAttrs (_: lib.take 1))
(lib.attrValues)
(lib.concatMap lib.trivial.id)
];
newest = builtins.head (builtins.sort preferable allReleases);

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

@ -8,7 +8,7 @@
let
pname = "comm";
version = "0.2.0";
version = "0.2.1";
in
buildPythonPackage {
inherit pname version;
@ -18,7 +18,7 @@ buildPythonPackage {
owner = "ipython";
repo = "comm";
rev = "refs/tags/v${version}";
hash = "sha256-bErZNTm0spO0A/Lc8kq5u7sB0FMXm/WMWtFbCNGJVXE=";
hash = "sha256-iyO3q9E2lYU1rMYTnsa+ZJYh+Hq72LEvE9ynebFIBUk=";
};
nativeBuildInputs = [

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

@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "ipykernel";
version = "6.28.0";
version = "6.29.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-acEUA9Jt5p3wIiWRb5FrN+pLmvQX2gqMgn+EMo2I5fM=";
hash = "sha256-td0wE8q3szDfcSiRyWzRq4aMJ6cVnmBvdiAV6b+M6z8=";
};
# debugpy is optional, see https://github.com/ipython/ipykernel/pull/767

36
pkgs/development/python-modules/ipython-sql/default.nix
View File

@ -1,32 +1,29 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, pythonOlder
, setuptools
, ipython
, ipython-genutils
, pandas
, prettytable
, pytest
, sqlalchemy
, sqlparse
}:
buildPythonPackage rec {
pname = "ipython-sql";
version = "0.4.0";
format = "setuptools";
version = "0.5.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "catherinedevlin";
repo = "ipython-sql";
rev = "117764caf099d80100ed4b09fc004b55eed6f121";
hash = "sha256-ScQihsvRSnC7VIgy8Tzi1z4x6KIZo0SAeLPvHAVdrfA=";
src = fetchPypi {
inherit pname version;
hash = "sha256-PbPOf5qV369Dh2+oCxa9u5oE3guhIELKsT6fWW/P/b4=";
};
postPatch = ''
substituteInPlace setup.py --replace 'prettytable<1' prettytable
'';
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
ipython
@ -36,17 +33,8 @@ buildPythonPackage rec {
sqlparse
];
nativeCheckInputs = [ ipython pandas pytest ];
checkPhase = ''
runHook preCheck
# running with ipython is required because the tests use objects available
# only inside of ipython, for example the global `get_ipython()` function
ipython -c 'import pytest; pytest.main()'
runHook postCheck
'';
# pypi tarball has no tests
doCheck = false;
pythonImportsCheck = [ "sql" ];

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

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "jupyter-lsp";
version = "2.2.1";
version = "2.2.2";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-sX+rbXD+g8iJawz/WSN2QAOCR8GWBWtDaEoJArap4Ps=";
hash = "sha256-JW0kYgVCrku6BKUPwfb/4ggJOgfY5pf+oKjRuMobfls=";
};
nativeBuildInputs = [

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

@ -34,14 +34,14 @@
buildPythonPackage rec {
pname = "jupyter-server";
version = "2.12.4";
version = "2.12.5";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "jupyter_server";
inherit version;
hash = "sha256-QfSh5rkSzCSnxsaUhRs309hBKxgPQ9cjFf5CLLK4XMI=";
hash = "sha256-DttibJS6oigJvhMj+XcM8cAKlSsXCXWS5A0D5qOVFok=";
};
nativeBuildInputs = [

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

@ -32,14 +32,14 @@ let
};
in buildPythonPackage rec {
pname = "nbconvert";
version = "7.14.1";
version = "7.14.2";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-IMuhDgRI3Hazvr/hrfkjZj47mDONr3e5e0JRHvWohhg=";
hash = "sha256-p/iAj9TggkMWc6xThAAhjdRe/QdvvrB8xuWqWjpOlJ4=";
};
# Add $out/share/jupyter to the list of paths that are used to search for

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

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "notebook";
version = "7.0.6";
version = "7.0.7";
disabled = pythonOlder "3.8";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-7GETsGUpAZ9/KHgZrwbJeiuvepWsIaj24yGSiY6fmlg=";
hash = "sha256-O8/wDBezrBQu9fQ21QY32TaydM+gtB9qwBdTY96bTgk=";
};
postPatch = ''

4
pkgs/development/tools/database/atlas/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "atlas";
version = "0.18.0";
version = "0.19.0";
src = fetchFromGitHub {
owner = "ariga";
repo = "atlas";
rev = "v${version}";
hash = "sha256-xbQ5ZhyCQY/IosBPMD8MKQ1KnIymPD8IhUKaIdXHAok=";
hash = "sha256-aTmEQFE+W8qRn7NlMYNr1yXYHLfmvg9Wrd8fzEeaYAo=";
};
modRoot = "cmd/atlas";

6
pkgs/development/tools/language-servers/nixd/default.nix
View File

@ -5,6 +5,7 @@
, bison
, boost182
, flex
, fmt
, gtest
, libbacktrace
, lit
@ -18,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "nixd";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nixd";
rev = version;
hash = "sha256-W44orkPZQ9gDUTogb8YVIaw4WHzUA+ExOXhTnZlJ6yY=";
hash = "sha256-i/z5VnsWPWloQfdk48i+a4XaGnTMPJ6QougChkT9IWw=";
};
mesonBuildType = "release";
@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libbacktrace
nix
fmt
gtest
boost182
llvmPackages.llvm

23
pkgs/development/tools/packet-sd/default.nix
View File

@ -1,4 +1,9 @@
{ buildGoModule, fetchFromGitHub, lib }:
{ buildGoModule
, fetchFromGitHub
, fetchpatch2
, lib
}:
buildGoModule rec {
pname = "prometheus-packet-sd";
version = "0.0.3";
@ -7,9 +12,23 @@ buildGoModule rec {
owner = "packethost";
repo = "prometheus-packet-sd";
rev = "v${version}";
sha256 = "sha256-2k8AsmyhQNNZCzpVt6JdgvI8IFb5pRi4ic6Yn2NqHMM=";
hash = "sha256-2k8AsmyhQNNZCzpVt6JdgvI8IFb5pRi4ic6Yn2NqHMM=";
};
patches = [
(fetchpatch2 {
# fix racy permissions on outfile
# https://github.com/packethost/prometheus-packet-sd/issues/15
url = "https://github.com/packethost/prometheus-packet-sd/commit/bf0ed3a1da4d0f797bd29e4a1857ac65a1d04750.patch";
hash = "sha256-ZLV9lyqZxpIQ1Cmzy/nY/85b4QWF5Ou0XcdrZXxck2E=";
})
(fetchpatch2 {
# restrict outfile to not be world/group writable
url = "https://github.com/packethost/prometheus-packet-sd/commit/a0afc2a4c3f49dc234d0d2c4901df25b4110b3ec.patch";
hash = "sha256-M5133+r77z21/Ulnbz+9sGbbuY5UpU1+22iY464UVAU=";
})
];
vendorHash = null;
subPackages = [ "." ];

8
pkgs/servers/home-automation/evcc/default.nix
View File

@ -16,20 +16,20 @@
buildGoModule rec {
pname = "evcc";
version = "0.123.9";
version = "0.124.0";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
rev = version;
hash = "sha256-BiJo0XsEdggmAfIzl717yDarDhD6IadP9an1Xv9N3ww=";
hash = "sha256-x6BsW4INahGFbFNprE1mZjlW/EoEMZgDIJACd9F+g6A=";
};
vendorHash = "sha256-1A87F6S4E87Uv05Ya4mA2B1QhJ1GEUtGx98/29m0LHI=";
vendorHash = "sha256-/TlbjyKGpVqkQAStx8QaAxpWsVYs0yxBMantqelYkhw=";
npmDeps = fetchNpmDeps {
inherit src;
hash = "sha256-a3AyqQ8GYP3g9KGbjtLHjHBrJGHg2sNjAQlMUa26pOY=";
hash = "sha256-Tl08gscv8WaMG4XfIVUWqj76xICWwUTBDK0VSs2kwMk=";
};
nativeBuildInputs = [

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

@ -2,25 +2,30 @@
, buildNpmPackage
, fetchFromGitHub
, nodejs_18
, systemdMinimal
, nixosTests
, nix-update-script
}:
buildNpmPackage rec {
pname = "zigbee2mqtt";
version = "1.35.1";
version = "1.35.2";
src = fetchFromGitHub {
owner = "Koenkk";
repo = "zigbee2mqtt";
rev = version;
hash = "sha256-ZOIV7PLBnPbisIStC+MNMZgf+Hw/+n4lONpgomRkZEE=";
hash = "sha256-AesGq2pWb8e2CJxTmP7RmtNYoAsXLAWp65eUjfjBK/A=";
};
npmDepsHash = "sha256-2WSuc9bmt5kK477c3AMOLFguvXZ2Nl+Qb67j5k7eL3o=";
npmDepsHash = "sha256-9mNUOidUmwOA+bFC8+pCerZ7JEYfQhYUM8D/WBW8IaE=";
nodejs = nodejs_18;
buildInputs = [
systemdMinimal
];
passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;
passthru.updateScript = nix-update-script { };

5
pkgs/tools/system/fakechroot/default.nix
View File

@ -39,6 +39,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/dex4er/fakechroot/commit/e7c1f3a446e594a4d0cce5f5d499c9439ce1d5c5.patch";
sha256 = "sha256-eX6kB4U1ZlXoRtkSVEIBTRjO/cTS/7z5a9S366DiRMg=";
})
# pass __readlinkat_chk buffer length
(fetchpatch {
url = "https://github.com/dex4er/fakechroot/pull/115/commits/15479d9436b534cee0115064bd8deb8d4ece9b8c.patch";
hash = "sha256-wMIZ3hW5XkRXQYBMADlN6kxhDSiEr84PGWBW+f4b4Ko=";
})
];
nativeBuildInputs = [ autoreconfHook ];

6
pkgs/tools/text/vale/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "vale";
version = "3.0.6";
version = "3.0.7";
subPackages = [ "cmd/vale" ];
outputs = [ "out" "data" ];
@ -11,10 +11,10 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
hash = "sha256-hCGJI2copXuyrxq4X1akR2Vz3DYS87dv3RZdw3gopNM=";
hash = "sha256-wCCW5yJPbXkwkkDywtIBR7gaJG0nLEHIC4xb1LbPa3w=";
};
vendorHash = "sha256-dkX/aQKuYNRynHuoj9m/6DI/mCEdp9XcKDt4TLx1rDU=";
vendorHash = "sha256-uEuzAMsQHTAbKeAPIWu2yoCLhBrQNEYxdmjfzLLWONQ=";
postInstall = ''
mkdir -p $data/share/vale