Merge remote-tracking branch 'ni/master'

This commit is contained in:
lassulus 2019-05-05 10:28:52 +02:00
commit 595574d433
8 changed files with 67 additions and 6 deletions

View File

@ -14,7 +14,7 @@ with import <stockholm/lib>;
version = "2.2.0";
sha256 = "1pb56dgf3jj2kq3cbbppwzyg3ccgqy9xara62hkjwyxzdx20clk1";
};
}.${versions.majorMinor nixpkgsVersion};
}.${versions.majorMinor version};
in mkDerivation {
pname = "blessings";

View File

@ -20,7 +20,7 @@ with import <stockholm/lib>;
rev = "refs/tags/v${cfg.version}";
sha256 = "11xjivpj495r2ss9aqljnpzzycb57cm4sr7yzmf939rzwsd3ib0x";
};
}.${versions.majorMinor nixpkgsVersion};
}.${versions.majorMinor version};
in mkDerivation {
pname = "email-header";

View File

@ -0,0 +1,55 @@
{ fetchFromGitHub, python3Packages, stdenv }:
python3Packages.buildPythonPackage rec {
inherit (meta) version;
pname = "ssh-audit";
src = fetchFromGitHub {
owner = "arthepsy";
repo = pname;
rev = "refs/tags/v${meta.version}";
sha256 = "0akrychkdym9f6830ysq787c9nc0bkyqvy4h72498lyghwvwc2ms";
};
checkInputs = [
python3Packages.pytest
python3Packages.pytestcov
];
checkPhase = ''
py.test --cov-report= --cov=ssh-audit -v test
'';
postPatch = ''
printf %s "$setupPy" > setup.py
mkdir scripts
cp ssh-audit.py scripts/ssh-audit
mkdir ssh-audit
cp ssh-audit.py ssh-audit/__init__.py
'';
setupPy = /* py */ ''
from distutils.core import setup
setup(
author='arthepsy',
description='${meta.description}',
license='${meta.license.spdxId}',
name='${pname}',
packages=['ssh-audit'],
scripts=['scripts/ssh-audit'],
url='${meta.homepage}',
version='${version}',
)
'';
meta = {
description = "tool for ssh server auditing";
homepage = "https://github.com/arthepsy/ssh-audit";
license = stdenv.lib.licenses.mit;
maintainers = [
stdenv.lib.maintainers.tv
];
version = "1.7.0";
};
}

@ -1 +1 @@
Subproject commit 5b8fb8dc0ee14672d7fd533bd98635b8725dbb29
Subproject commit ee41207df1ce718e0b154ed8047384118a0133a4

View File

@ -42,6 +42,9 @@ in {
# ref <stockholm/krebs/3modules>, services.openssh.knownHosts.github*
(json https://api.github.com/meta)
# ref <nixpkgs/pkgs/tools/security/ssh-audit>
(json https://api.github.com/repos/arthepsy/ssh-audit/tags)
# 2014-12-20 ref src/nixpkgs/pkgs/tools/networking/tlsdate/default.nix
(json https://api.github.com/repos/ioerror/tlsdate/tags)

View File

@ -72,6 +72,7 @@ in {
exec ${xmonad}
'';
xmonad-ready = pkgs.writeDash "xmonad-ready" ''
${pkgs.systemd}/bin/systemd-notify --ready
{
${pkgs.xorg.xhost}/bin/xhost +SI:localuser:${cfg.user.name}
${pkgs.xorg.xhost}/bin/xhost -LOCAL:
@ -119,6 +120,9 @@ in {
SyslogIdentifier = "xmonad";
User = cfg.user.name;
WorkingDirectory = cfg.user.home;
NotifyAccess = "all";
Type = "notify";
};
};

View File

@ -21,8 +21,7 @@ in {
});
systemd.services.${if cfg.enable then "Xresources" else null} = {
wantedBy = [ "graphical.target" ];
after = [ "xserver.service" ];
requires = [ "xserver.service" ];
after = [ "xmonad.service" ];
environment = {
DISPLAY = ":${toString config.services.xserver.display}";
};

View File

@ -45,7 +45,7 @@ foldl' mergeAttrs {}
self.callPackage ./compat/18.03/pass {
pass-otp = self.callPackage ./compat/18.03/pass-otp {};
};
}.${versions.majorMinor nixpkgsVersion} or
}.${versions.majorMinor version} or
super.pass.withExtensions (ext: [
ext.pass-otp
]);