Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
d21a1c3fbc
13 changed files with 2312 additions and 1377 deletions
|
|
@ -144,7 +144,7 @@ in
|
|||
dictd = 105;
|
||||
couchdb = 106;
|
||||
#searx = 107; # dynamically allocated as of 2020-10-27
|
||||
kippo = 108;
|
||||
#kippo = 108; # removed 2021-10-07, the kippo package was removed in 1b213f321cdbfcf868b96fd9959c24207ce1b66a during 2021-04
|
||||
jenkins = 109;
|
||||
systemd-journal-gateway = 110;
|
||||
#notbit = 111; # unused
|
||||
|
|
@ -462,7 +462,7 @@ in
|
|||
dictd = 105;
|
||||
couchdb = 106;
|
||||
#searx = 107; # dynamically allocated as of 2020-10-27
|
||||
kippo = 108;
|
||||
#kippo = 108; # removed 2021-10-07, the kippo package was removed in 1b213f321cdbfcf868b96fd9959c24207ce1b66a during 2021-04
|
||||
jenkins = 109;
|
||||
systemd-journal-gateway = 110;
|
||||
#notbit = 111; # unused
|
||||
|
|
|
|||
|
|
@ -760,7 +760,6 @@
|
|||
./services/networking/kea.nix
|
||||
./services/networking/keepalived/default.nix
|
||||
./services/networking/keybase.nix
|
||||
./services/networking/kippo.nix
|
||||
./services/networking/knot.nix
|
||||
./services/networking/kresd.nix
|
||||
./services/networking/lambdabot.nix
|
||||
|
|
|
|||
|
|
@ -81,6 +81,8 @@ with lib;
|
|||
'')
|
||||
(mkRemovedOptionModule ["services" "wakeonlan"] "This module was removed in favor of enabling it with networking.interfaces.<name>.wakeOnLan")
|
||||
|
||||
(mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.")
|
||||
|
||||
# Do NOT add any option renames here, see top of the file
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,117 +0,0 @@
|
|||
# NixOS module for kippo honeypot ssh server
|
||||
# See all the options for configuration details.
|
||||
#
|
||||
# Default port is 2222. Recommend using something like this for port redirection to default SSH port:
|
||||
# networking.firewall.extraCommands = ''
|
||||
# iptables -t nat -A PREROUTING -i IN_IFACE -p tcp --dport 22 -j REDIRECT --to-port 2222'';
|
||||
#
|
||||
# Lastly: use this service at your own risk. I am working on a way to run this inside a VM.
|
||||
{ config, lib, pkgs, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.kippo;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.kippo = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = "Enable the kippo honeypot ssh server.";
|
||||
};
|
||||
port = mkOption {
|
||||
default = 2222;
|
||||
type = types.int;
|
||||
description = "TCP port number for kippo to bind to.";
|
||||
};
|
||||
hostname = mkOption {
|
||||
default = "nas3";
|
||||
type = types.str;
|
||||
description = "Hostname for kippo to present to SSH login";
|
||||
};
|
||||
varPath = mkOption {
|
||||
default = "/var/lib/kippo";
|
||||
type = types.path;
|
||||
description = "Path of read/write files needed for operation and configuration.";
|
||||
};
|
||||
logPath = mkOption {
|
||||
default = "/var/log/kippo";
|
||||
type = types.path;
|
||||
description = "Path of log files needed for operation and configuration.";
|
||||
};
|
||||
pidPath = mkOption {
|
||||
default = "/run/kippo";
|
||||
type = types.path;
|
||||
description = "Path of pid files needed for operation.";
|
||||
};
|
||||
extraConfig = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = "Extra verbatim configuration added to the end of kippo.cfg.";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs.pythonPackages; [
|
||||
python pkgs.kippo.twisted pycrypto pyasn1 ];
|
||||
|
||||
environment.etc."kippo.cfg".text = ''
|
||||
# Automatically generated by NixOS.
|
||||
# See ${pkgs.kippo}/src/kippo.cfg for details.
|
||||
[honeypot]
|
||||
log_path = ${cfg.logPath}
|
||||
download_path = ${cfg.logPath}/dl
|
||||
filesystem_file = ${cfg.varPath}/honeyfs
|
||||
filesystem_file = ${cfg.varPath}/fs.pickle
|
||||
data_path = ${cfg.varPath}/data
|
||||
txtcmds_path = ${cfg.varPath}/txtcmds
|
||||
public_key = ${cfg.varPath}/keys/public.key
|
||||
private_key = ${cfg.varPath}/keys/private.key
|
||||
ssh_port = ${toString cfg.port}
|
||||
hostname = ${cfg.hostname}
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
|
||||
users.users.kippo = {
|
||||
description = "kippo web server privilege separation user";
|
||||
uid = 108; # why does config.ids.uids.kippo give an error?
|
||||
};
|
||||
users.groups.kippo.gid = 108;
|
||||
|
||||
systemd.services.kippo = with pkgs; {
|
||||
description = "Kippo Web Server";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.kippo.twisted}/lib/python2.7/site-packages/:.";
|
||||
preStart = ''
|
||||
if [ ! -d ${cfg.varPath}/ ] ; then
|
||||
mkdir -p ${cfg.logPath}/tty
|
||||
mkdir -p ${cfg.logPath}/dl
|
||||
mkdir -p ${cfg.varPath}/keys
|
||||
cp ${pkgs.kippo}/src/honeyfs ${cfg.varPath} -r
|
||||
cp ${pkgs.kippo}/src/fs.pickle ${cfg.varPath}/fs.pickle
|
||||
cp ${pkgs.kippo}/src/data ${cfg.varPath} -r
|
||||
cp ${pkgs.kippo}/src/txtcmds ${cfg.varPath} -r
|
||||
|
||||
chmod u+rw ${cfg.varPath} -R
|
||||
chown kippo.kippo ${cfg.varPath} -R
|
||||
chown kippo.kippo ${cfg.logPath} -R
|
||||
chmod u+rw ${cfg.logPath} -R
|
||||
fi
|
||||
if [ ! -d ${cfg.pidPath}/ ] ; then
|
||||
mkdir -p ${cfg.pidPath}
|
||||
chmod u+rw ${cfg.pidPath}
|
||||
chown kippo.kippo ${cfg.pidPath}
|
||||
fi
|
||||
'';
|
||||
|
||||
serviceConfig.ExecStart = "${pkgs.kippo.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n";
|
||||
serviceConfig.PermissionsStartOnly = true;
|
||||
serviceConfig.User = "kippo";
|
||||
serviceConfig.Group = "kippo";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wxsqlite3";
|
||||
version = "4.6.4";
|
||||
version = "4.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "utelle";
|
||||
repo = "wxsqlite3";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fIm8xbNP7pjzvfBn7NgYmUtbVVh2aiaXQVANJQnrWCs=";
|
||||
sha256 = "sha256-t8y4oq4p7ZMDELAkRVmoNguYRNG8spcW7MHnpdINN8g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
19
pkgs/development/php-packages/amqp/default.nix
Normal file
19
pkgs/development/php-packages/amqp/default.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ buildPecl, lib, rabbitmq-c }:
|
||||
|
||||
buildPecl {
|
||||
pname = "amqp";
|
||||
|
||||
version = "1.11.0beta";
|
||||
sha256 = "sha256-HbVLN6fg2htYZgAFw+IhYHP+XN8j7cTLG6S0YHHOC14=";
|
||||
|
||||
buildInputs = [ rabbitmq-c ];
|
||||
|
||||
AMQP_DIR = rabbitmq-c;
|
||||
|
||||
meta = with lib; {
|
||||
description = "PHP extension to communicate with any AMQP compliant server";
|
||||
license = licenses.php301;
|
||||
homepage = "https://github.com/php-amqp/php-amqp";
|
||||
maintainers = teams.php.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, cmake
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, pytest
|
||||
|
|
@ -11,19 +12,19 @@
|
|||
, scipy
|
||||
, pandas
|
||||
, matplotlib
|
||||
, ninja
|
||||
, numba
|
||||
, pybind11
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "phik";
|
||||
version = "0.12.0";
|
||||
format = "wheel";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
python = "py3";
|
||||
sha256 = "57db39d1c74c84a24d0270b63d1c629a5cb975462919895b96a8522ae0678408";
|
||||
inherit pname version;
|
||||
sha256 = "959fd40482246e3f643cdac5ea04135b2c11a487e917af7d4e75843f47183549";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
@ -40,6 +41,15 @@ buildPythonPackage rec {
|
|||
pandas
|
||||
matplotlib
|
||||
numba
|
||||
pybind11
|
||||
];
|
||||
|
||||
# uses setuptools to drive build process
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,24 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dejagnu";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0qfj2wd4qk1yn9yzam6g8nmyxfazcc0knjyyibycb2ainkhp21hd";
|
||||
sha256 = "1qx2cv6qkxbiqg87jh217jb62hk3s7dmcs4cz1llm2wmsynfznl7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ expect ];
|
||||
|
||||
# dejagnu-1.6.3 can't successfully run tests in source tree:
|
||||
# https://wiki.linuxfromscratch.org/lfs/ticket/4871
|
||||
preConfigure = ''
|
||||
mkdir build
|
||||
cd build
|
||||
'';
|
||||
configureScript = "../configure";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Note: The test-suite *requires* /dev/pts among the `build-chroot-dirs' of
|
||||
|
|
|
|||
|
|
@ -4,19 +4,19 @@
|
|||
# * Download the tarball of the new version to use.
|
||||
# * Remove the `resolutions`-section from upstream `package.json`
|
||||
# as this breaks with `yarn2nix`.
|
||||
# * Regenerate `yarn.lock` and `yarn2nix`.
|
||||
# * Regenerate `yarn.lock` and `yarn2nix --no-patch`.
|
||||
# * Replace new `package.json`, `yarn.nix`, `yarn.lock` here.
|
||||
# * Update `version`+`hash` and rebuild.
|
||||
|
||||
mkYarnPackage rec {
|
||||
pname = "grafana-image-renderer";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "grafana-image-renderer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PEi8jreYCafKBa8M5Mo6/g03pS1PHvmhgMpuwIlUePY=";
|
||||
sha256 = "sha256-1xHRfEjtxiXXRt6Rpl4j8xxTQ6qXG4/ps885CLc35OQ=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
"url": "http://github.com/grafana/grafana-image-renderer.git"
|
||||
},
|
||||
"scripts": {
|
||||
"eslint": "eslint -c eslint.json",
|
||||
"eslint": "eslint . --ext .ts",
|
||||
"typecheck": "tsc --noEmit",
|
||||
"prettier:check": "prettier --list-different \"**/*.ts\"",
|
||||
"prettier:write": "prettier --list-different \"**/*.ts\" --write",
|
||||
|
|
@ -22,7 +22,6 @@
|
|||
"@grpc/proto-loader": "^0.5.4",
|
||||
"@hapi/boom": "^9.1.0",
|
||||
"chokidar": "^3.5.2",
|
||||
"eslint": "^7.13.0",
|
||||
"express": "^4.16.3",
|
||||
"express-prom-bundle": "^5.1.5",
|
||||
"google-protobuf": "3.5.0",
|
||||
|
|
@ -37,11 +36,20 @@
|
|||
"winston": "^3.2.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@grafana/eslint-config": "^2.5.0",
|
||||
"@types/express": "^4.11.1",
|
||||
"@types/node": "^14.14.41",
|
||||
"@typescript-eslint/eslint-plugin": "^4.32.0",
|
||||
"@typescript-eslint/parser": "^4.32.0",
|
||||
"eslint": "^7.32.0",
|
||||
"eslint-config-prettier": "^8.3.0",
|
||||
"eslint-plugin-jsdoc": "^36.1.0",
|
||||
"eslint-plugin-prettier": "^4.0.0",
|
||||
"eslint-plugin-react": "^7.26.1",
|
||||
"eslint-plugin-react-hooks": "^4.2.0",
|
||||
"husky": "^4.3.8",
|
||||
"lint-staged": "^9.5.0",
|
||||
"pkg": "^5.1.0",
|
||||
"lint-staged": "^11.2.0",
|
||||
"pkg": "^5.3.3",
|
||||
"prettier": "2.2.1",
|
||||
"tsc-watch": "^4.2.3",
|
||||
"typescript": "^4.3.2"
|
||||
|
|
@ -53,8 +61,7 @@
|
|||
},
|
||||
"lint-staged": {
|
||||
"*.ts": [
|
||||
"prettier --write",
|
||||
"git add"
|
||||
"prettier --write"
|
||||
]
|
||||
},
|
||||
"pkg": {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -159,6 +159,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
# or php.withExtensions to extend the functionality of the PHP
|
||||
# interpreter.
|
||||
extensions = {
|
||||
amqp = callPackage ../development/php-packages/amqp { };
|
||||
|
||||
apcu = callPackage ../development/php-packages/apcu { };
|
||||
|
||||
apcu_bc = callPackage ../development/php-packages/apcu_bc { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue