diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bf1dd6b6238..bf873b7ea0e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10794,6 +10794,16 @@ github = "pulsation"; githubId = 1838397; }; + zseri = { + name = "zseri"; + email = "zseri.devel@ytrizja.de"; + github = "zseri"; + githubId = 1618343; + keys = [{ + longkeyid = "rsa4096/0x229E63AE5644A96D"; + fingerprint = "7AFB C595 0D3A 77BD B00F 947B 229E 63AE 5644 A96D"; + }]; + }; zupo = { name = "Nejc Zupan"; email = "nejczupan+nix@gmail.com"; diff --git a/pkgs/development/libraries/libowlevelzs/default.nix b/pkgs/development/libraries/libowlevelzs/default.nix new file mode 100644 index 00000000000..e024874eabe --- /dev/null +++ b/pkgs/development/libraries/libowlevelzs/default.nix @@ -0,0 +1,27 @@ +{ cmake +, fetchFromGitHub +, lib +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "libowlevelzs"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "zseri"; + repo = "libowlevelzs"; + rev = "v${version}"; + sha256 = "y/EaMMsmJEmnptfjwiat4FC2+iIKlndC2Wdpop3t7vY="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Zscheile Lowlevel (utility) library"; + homepage = "https://github.com/zseri/libowlevelzs"; + license = licenses.mit; + maintainers = with maintainers; [ zseri ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix b/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix new file mode 100644 index 00000000000..275cc88e597 --- /dev/null +++ b/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix @@ -0,0 +1,36 @@ +{ cmake +, fetchFromGitHub +, fping +, lib +, libowlevelzs +, net-snmp +, stdenv +}: + +# TODO: add a services entry for the /etc/zs-apc-spdu.conf file +stdenv.mkDerivation rec { + pname = "zs-apc-spdu-ctl"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "zseri"; + repo = "zs-apc-spdu-ctl"; + rev = "v${version}"; + sha256 = "TMV9ETWBVeXq6tZ2e0CrvHBXoyKfOLCQurjBdf/iw/M="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ fping libowlevelzs net-snmp ]; + + postPatch = '' + substituteInPlace src/confent.cxx \ + --replace /usr/sbin/fping "${lib.makeBinPath [fping]}/fping" + ''; + + meta = with lib; { + description = "APC SPDU control utility"; + license = licenses.mit; + maintainers = with maintainers; [ zseri ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf3b59d3f9e..7c7def93087 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9386,6 +9386,8 @@ in zinit = callPackage ../shells/zsh/zinit {} ; + zs-apc-spdu-ctl = callPackage ../tools/networking/zs-apc-spdu-ctl { }; + zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; zsh-autopair = callPackage ../shells/zsh/zsh-autopair { }; @@ -23482,6 +23484,8 @@ in libowfat = callPackage ../development/libraries/libowfat { }; + libowlevelzs = callPackage ../development/libraries/libowlevelzs { }; + librecad = libsForQt514.callPackage ../applications/misc/librecad { }; libreoffice = hiPrio libreoffice-still;