Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-02-13 18:16:03 +00:00
committed by GitHub
30 changed files with 1641 additions and 958 deletions
+4 -4
View File
@@ -14,12 +14,12 @@ let
in
stdenv.mkDerivation rec {
pname = "boundary";
version = "0.1.5";
version = "0.1.6";
src = fetchsrc version {
x86_64-linux = "sha256-A8dfmFjvOHDwotCyRq9QQ9uHJIkq1JkIwtHsqDqTSNo=";
aarch64-linux = "sha256-i2qc4bmoSzUwNCQmnXLFQ+W4VZjVwXzEBSF3NeTju3M=";
x86_64-darwin = "sha256-lKGTpS2TmgxFdjUsBXKg8Mu6oJA0VidHc/noWWEuUVo=";
x86_64-linux = "sha256-6Pwl8smp6ZX57hzPc7e8gVSqnPHse+RvhU2xprG/2dg=";
aarch64-linux = "sha256-/ZhLZ/Sj0h4HvOJthe83Y5Hqpz1UYiaQZxuyR8loI44=";
x86_64-darwin = "sha256-s+XoEmup/jvIf+jGI3OPIGFDwsWbgE1yuySLWsC3jJE=";
};
dontConfigure = true;
+4 -1
View File
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = with lib; [ boost zlib openssl ]
++ optional upnpSupport miniupnpc;
makeFlags =
let ynf = a: b: a + "=" + (if b then "yes" else "no"); in
[ (ynf "USE_AESNI" aesniSupport)
@@ -27,6 +28,8 @@ stdenv.mkDerivation rec {
(ynf "USE_UPNP" upnpSupport)
];
enableParallelBuilding = true;
installPhase = ''
install -D i2pd $out/bin/i2pd
'';
@@ -36,6 +39,6 @@ stdenv.mkDerivation rec {
description = "Minimal I2P router written in C++";
license = licenses.bsd3;
maintainers = with maintainers; [ edwtjo ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}
@@ -0,0 +1,29 @@
{ lib, perlPackages, fetchFromGitHub, installShellFiles }:
perlPackages.buildPerlPackage rec {
pname = "wakeonlan";
version = "0.41";
src = fetchFromGitHub {
owner = "jpoliv";
repo = pname;
rev = "wakeonlan-${version}";
sha256 = "0m48b39lz0yc5ckx2jx8y2p4c8npjngxl9wy86k43xgsd8mq1g3c";
};
outputs = [ "out" ];
nativeBuildInputs = [ installShellFiles ];
installPhase = ''
install -Dt $out/bin wakeonlan
installManPage blib/man1/wakeonlan.1
'';
meta = with lib; {
description = "Perl script for waking up computers via Wake-On-LAN magic packets";
homepage = "https://github.com/jpoliv/wakeonlan";
license = licenses.artistic1;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}