From 95f6a06c5acfb6054236ea2f5aee42975dd909ec Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 26 Apr 2019 20:31:03 +0200 Subject: prison-break: move to krebs --- krebs/5pkgs/simple/prison-break/default.nix | 20 ++++++++++++++++++++ .../5pkgs/simple/prison-break/straight-plugin.nix | 22 ++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 krebs/5pkgs/simple/prison-break/default.nix create mode 100644 krebs/5pkgs/simple/prison-break/straight-plugin.nix (limited to 'krebs') diff --git a/krebs/5pkgs/simple/prison-break/default.nix b/krebs/5pkgs/simple/prison-break/default.nix new file mode 100644 index 00000000..051a4618 --- /dev/null +++ b/krebs/5pkgs/simple/prison-break/default.nix @@ -0,0 +1,20 @@ +{pkgs, fetchFromGitHub}: +with pkgs.python3.pkgs; + +buildPythonPackage rec { + pname = "prison-break"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "makefu"; + repo = pname; + rev = "1.0.0"; + sha256 = "0ab42z6qr42vz4fc077irn9ykrrylagx1dzlw8dqcanf49dxd961"; + }; + propagatedBuildInputs = [ + docopt + requests + beautifulsoup4 + (callPackage ./straight-plugin.nix {}) + ]; + checkInputs = [ black ]; +} diff --git a/krebs/5pkgs/simple/prison-break/straight-plugin.nix b/krebs/5pkgs/simple/prison-break/straight-plugin.nix new file mode 100644 index 00000000..606c60b5 --- /dev/null +++ b/krebs/5pkgs/simple/prison-break/straight-plugin.nix @@ -0,0 +1,22 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "straight-plugin"; + version = "1.5.0"; + + src = fetchPypi { + pname = "straight.plugin"; + inherit version; + sha256 = "818a7641068932ed6436d0af0a3bb77bbbde29df0a7142c8bd1a249e7c2f0d38"; + }; + + meta = with lib; { + description = "A simple namespaced plugin facility"; + homepage = https://github.com/ironfroggy/straight.plugin; + license = licenses.mit; + maintainers = [ maintainers.makefu ]; + }; +} -- cgit v1.2.3 From 18b98333d4c6cdafef7dcb77c249eb106ed53521 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 28 Apr 2019 15:01:50 +0200 Subject: irc-announce: add _ to nick, for filtering --- krebs/5pkgs/simple/irc-announce/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/5pkgs/simple/irc-announce/default.nix b/krebs/5pkgs/simple/irc-announce/default.nix index e1f4919d..b22e6753 100644 --- a/krebs/5pkgs/simple/irc-announce/default.nix +++ b/krebs/5pkgs/simple/irc-announce/default.nix @@ -15,7 +15,7 @@ pkgs.writeDashBin "irc-announce" '' IRC_SERVER=$1 IRC_PORT=$2 - IRC_NICK=$3$$ + IRC_NICK=$3_$$ IRC_CHANNEL=$4 message=$5 -- cgit v1.2.3 From 222160fc3a195415e859048bdef21f703154b3ee Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 30 Apr 2019 19:12:00 +0200 Subject: allow multiple hostKeys --- krebs/3modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 734d6c78..10a33d5d 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -132,7 +132,7 @@ let services.openssh.hostKeys = let inherit (config.krebs.build.host.ssh) privkey; in - mkIf (privkey != null) (mkForce [privkey]); + mkIf (privkey != null) [privkey]; # TODO use imports for merging services.openssh.knownHosts = -- cgit v1.2.3 From c7d02cb595f59fd6f4cd471eb44aa3e1b2c13dd7 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 30 Apr 2019 20:25:53 +0200 Subject: ssh-audit: init at 1.7.0 --- krebs/5pkgs/simple/ssh-audit.nix | 55 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 krebs/5pkgs/simple/ssh-audit.nix (limited to 'krebs') 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"; + }; +} -- cgit v1.2.3 From df6007c2eb3c6fab9106c3fc591fded7221b1708 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 30 Apr 2019 21:50:07 +0200 Subject: treewide: nixpkgsVersion -> version --- krebs/5pkgs/haskell/blessings.nix | 2 +- krebs/5pkgs/haskell/email-header.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'krebs') 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 ; 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 ; rev = "refs/tags/v${cfg.version}"; sha256 = "11xjivpj495r2ss9aqljnpzzycb57cm4sr7yzmf939rzwsd3ib0x"; }; - }.${versions.majorMinor nixpkgsVersion}; + }.${versions.majorMinor version}; in mkDerivation { pname = "email-header"; -- cgit v1.2.3 From 397fad23666f0705f03af166ad0b9a7d87104e4d Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 5 May 2019 10:27:57 +0200 Subject: nixpkgs: cf3e277 -> 04954e3 --- krebs/nixpkgs.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 0bc3abf9..ae75f607 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "cf3e277dd0bd710af0df667e9364f4bd80c72713", - "date": "2019-04-24T23:55:21+02:00", - "sha256": "1abyadl3sxf67yi65758hq6hf2j07afgp1fmkk7kd94dadx6r6f4", + "rev": "04954e39df88487bf5b6bb5e532520e83a6c22ea", + "date": "2019-05-04T20:25:55-04:00", + "sha256": "1l6wc13mwwhv0msa0596wvsq2j2kxj1wjchdz4v1zzia781rpd8m", "fetchSubmodules": false } -- cgit v1.2.3 From 31df4e128b094a757fff6641db22a042e3da6b8a Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 20 May 2019 11:42:36 +0200 Subject: nixpkgs: 04954e3 -> 705986f --- krebs/nixpkgs.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index ae75f607..811eb826 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "04954e39df88487bf5b6bb5e532520e83a6c22ea", - "date": "2019-05-04T20:25:55-04:00", - "sha256": "1l6wc13mwwhv0msa0596wvsq2j2kxj1wjchdz4v1zzia781rpd8m", + "rev": "705986f5a986be5c5ae13193b487c7ec8ca05f16", + "date": "2019-05-18T20:38:59-04:00", + "sha256": "0zpch2cpl2yx0mp7hnyjd03hqs7rxza9wc2p97njsdzhi56gxwxp", "fetchSubmodules": false } -- cgit v1.2.3