summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/5pkgs/haskell/blessings.nix2
-rw-r--r--krebs/5pkgs/haskell/email-header.nix2
-rw-r--r--krebs/5pkgs/simple/ssh-audit.nix55
m---------submodules/krops0
-rw-r--r--tv/2configs/urlwatch.nix3
-rw-r--r--tv/2configs/xserver/default.nix4
-rw-r--r--tv/3modules/Xresources.nix3
-rw-r--r--tv/5pkgs/default.nix2
8 files changed, 66 insertions, 5 deletions
diff --git a/krebs/5pkgs/haskell/blessings.nix b/krebs/5pkgs/haskell/blessings.nix
index c35706eb..7abebba5 100644
--- a/krebs/5pkgs/haskell/blessings.nix
+++ b/krebs/5pkgs/haskell/blessings.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
version = "2.2.0";
sha256 = "1pb56dgf3jj2kq3cbbppwzyg3ccgqy9xara62hkjwyxzdx20clk1";
};
- }.${versions.majorMinor nixpkgsVersion};
+ }.${versions.majorMinor version};
in mkDerivation {
pname = "blessings";
diff --git a/krebs/5pkgs/haskell/email-header.nix b/krebs/5pkgs/haskell/email-header.nix
index 6689f1d2..fe4bb839 100644
--- a/krebs/5pkgs/haskell/email-header.nix
+++ b/krebs/5pkgs/haskell/email-header.nix
@@ -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";
diff --git a/krebs/5pkgs/simple/ssh-audit.nix b/krebs/5pkgs/simple/ssh-audit.nix
new file mode 100644
index 00000000..7d2e6fb3
--- /dev/null
+++ b/krebs/5pkgs/simple/ssh-audit.nix
@@ -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";
+ };
+}
diff --git a/submodules/krops b/submodules/krops
-Subproject 5b8fb8dc0ee14672d7fd533bd98635b8725dbb2
+Subproject ee41207df1ce718e0b154ed8047384118a0133a
diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix
index 7467e8e6..40dc7d23 100644
--- a/tv/2configs/urlwatch.nix
+++ b/tv/2configs/urlwatch.nix
@@ -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)
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 012caff7..35774453 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -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";
};
};
diff --git a/tv/3modules/Xresources.nix b/tv/3modules/Xresources.nix
index 983b8bc2..ce7ac9ac 100644
--- a/tv/3modules/Xresources.nix
+++ b/tv/3modules/Xresources.nix
@@ -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}";
};
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 8f960dd7..2f6b67e7 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -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
]);