JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-28 06:21:13 +00:00 committed by GitHub
commit d2f5d37c7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 337 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -9800,6 +9800,12 @@
githubId = 1322201;
name = "Yochai";
};
yoctocell = {
email = "public@yoctocell.xyz";
github = "yoctocell";
githubId = 40352765;
name = "Yoctocell";
};
yorickvp = {
email = "yorickvanpelt@gmail.com";
github = "yorickvp";

16
nixos/modules/services/web-apps/zabbix.nix
View File

@ -3,7 +3,7 @@
let
inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types;
inherit (lib) literalExample mapAttrs optionalString;
inherit (lib) literalExample mapAttrs optionalString versionAtLeast;
cfg = config.services.zabbixWeb;
fpm = config.services.phpfpm.pools.zabbix;
@ -28,6 +28,8 @@ let
$ZBX_SERVER_PORT = '${toString cfg.server.port}';
$ZBX_SERVER_NAME = ''';
$IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG;
${cfg.extraConfig}
'';
in
@ -143,6 +145,14 @@ in
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
description = ''
Additional configuration to be copied verbatim into <filename>zabbix.conf.php</filename>.
'';
};
};
};
@ -150,6 +160,10 @@ in
config = mkIf cfg.enable {
services.zabbixWeb.extraConfig = optionalString ((versionAtLeast config.system.stateVersion "20.09") && (versionAtLeast cfg.package.version "5.0.0")) ''
$DB['DOUBLE_IEEE754'] = 'true';
'';
systemd.tmpfiles.rules = [
"d '${stateDir}' 0750 ${user} ${group} - -"
"d '${stateDir}/session' 0750 ${user} ${config.services.httpd.group} - -"

4
pkgs/applications/audio/redoflacs/default.nix
View File

@ -5,8 +5,6 @@
, installShellFiles
, flac
, sox
, withAucdtect ? false
, aucdtect ? null
}:
stdenv.mkDerivation rec {
@ -36,7 +34,7 @@ stdenv.mkDerivation rec {
postFixup = ''
wrapProgram $out/bin/redoflacs \
--prefix PATH : ${stdenv.lib.makeBinPath ([ flac sox ] ++ lib.optional withAucdtect aucdtect)}
--prefix PATH : ${stdenv.lib.makeBinPath ([ flac sox ])}
'';
meta = with lib; {

34
pkgs/applications/misc/terminal-typeracer/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv
, fetchFromGitLab
, rustPlatform
, pkg-config
, openssl
, sqlite
, libiconv
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "terminal-typeracer";
version = "2.0.2";
src = fetchFromGitLab {
owner = "ttyperacer";
repo = pname;
rev = "v${version}";
sha256 = "187xrqxalk2gxa22ki5q092llvliddrsc68cg4dvvy2xzq254jfy";
};
cargoSha256 = "0ky8m23fjjbv7fr9776fjczpg0d43jxwnjxjpwz56jpynwnihfkl";
buildInputs = [ openssl sqlite ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
nativeBuildInputs = [ pkg-config ];
meta = with stdenv.lib; {
description = "An open source terminal based version of Typeracer written in rust";
homepage = "https://gitlab.com/ttyperacer/terminal-typeracer";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ yoctocell ];
platforms = platforms.x86_64;
};
}

4
pkgs/applications/networking/instant-messengers/neochat/default.nix
View File

@ -7,6 +7,7 @@
, qttools
, qtquickcontrols2
, qtmultimedia
, qtgraphicaleffects
, qtkeychain
, libpulseaudio
, olm
@ -14,6 +15,7 @@
, cmark
, extra-cmake-modules
, kirigami2
, kitemmodels
, ki18n
, knotifications
, kdbusaddons
@ -40,10 +42,12 @@ mkDerivation rec {
qtkeychain
qtquickcontrols2
qtmultimedia
qtgraphicaleffects
olm
libsecret
cmark
kirigami2
kitemmodels
ki18n
knotifications
kdbusaddons

8
pkgs/applications/networking/instant-messengers/rambox/pro.nix
View File

@ -1,11 +1,11 @@
{ autoPatchelfHook, electron_4, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }:
{ autoPatchelfHook, electron_7, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }:
let
electron = electron_4;
electron = electron_7;
in
stdenv.mkDerivation rec {
pname = "rambox-pro";
version = "1.3.2";
version = "1.4.1";
dontBuild = true;
dontStrip = true;
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz";
sha256 = "010v5i8lxfz77cb5cn9va5cbnfa28nzdymk5k2fcpi65jldw1pxx";
sha256 = "1bd4fba3ac8c20fa557ebfb110f6503d36e6c3dba0401d1073529dcae2c2ec1e";
};
installPhase = ''

4
pkgs/applications/virtualization/charliecloud/default.nix
View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
version = "0.20";
version = "0.21";
pname = "charliecloud";
src = fetchFromGitHub {
owner = "hpc";
repo = "charliecloud";
rev = "v${version}";
sha256 = "15ihffwhpjnzgz0ir5vc9la4fwkqj91vmrcsb2r58ikq7h9sk45j";
sha256 = "Y/tH6Znq//HBA/FHfIm2Wpppx6TiL7CqKtZFDc/XSNc=";
};
nativeBuildInputs = [ autoreconfHook makeWrapper ];

30
pkgs/data/themes/sweet/default.nix
View File

@ -1,46 +1,46 @@
{ stdenv, fetchurl, unzip }:
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "sweet";
version = "1.10.5";
version = "2.0";
srcs = [
(fetchurl {
url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar-Blue.zip";
sha256 = "11040hx8ci4vbnyaj63zj924v0ln7rjm9a28mcqdax60h3dp12lj";
url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Ambar-Blue.tar.xz";
sha256 = "028pk07im7pab8a2vh3bvjm8jg37dpvn4c1mwn6vhb6wcr9v5c75";
})
(fetchurl {
url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar.zip";
sha256 = "0lvnjmirpwdav8q0bfbhybwkr2h6dilc7lhhj18xd2k57xadjmxr";
url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Ambar.tar.xz";
sha256 = "0zmdmqndj65kr43g3z57blrmv0y856zlfprm6y45zbf4xz3ybkg6";
})
(fetchurl {
url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Dark.zip";
sha256 = "0a7mh1pgvi8w1ahsmvgnmpdawm30lcjqk4zqvg0lqadsd04dn4h1";
url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Dark.tar.xz";
sha256 = "02sw664fkrfpsygspq8fn4zgk8rxs9rd29nnx6nyvkji68mb51s6";
})
(fetchurl {
url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-mars.zip";
sha256 = "0n2dkl35qrik10wvhvkayyra987p03g56pxhz5kc73cbsl5zd96l";
url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-mars.tar.xz";
sha256 = "14rl3il61jyqwiqlpgbh397q3rcs7jcf2pvr2763ar5a9czmy8h6";
})
(fetchurl {
url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet.zip";
sha256 = "0wwmc3wj2pjg4kimfkvcsimk3s4s7l7k000vxqi8yjlfs70f273c";
url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet.tar.xz";
sha256 = "0rza3yxwj256ibqimymjhd6lpjzr7fkhggq0ijdg1wab3q91x66q";
})
];
nativeBuildInputs = [ unzip ];
sourceRoot = ".";
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes/
cp -a Sweet* $out/share/themes/
rm $out/share/themes/*/{LICENSE,README*}
runHook postInstall
'';
meta = with stdenv.lib; {
description = "Light and dark colorful Gtk3.20+ theme";
homepage = "https://github.com/EliverLara/Sweet";
license = licenses.gpl3;
license = licenses.gpl3Only;
maintainers = with maintainers; [ fuzen ];
platforms = platforms.linux;
};

1
pkgs/desktops/xfce/applications/mousepad/default.nix
View File

@ -4,6 +4,7 @@ mkXfceDerivation {
category = "apps";
pname = "mousepad";
version = "0.4.2";
odd-unstable = false;
sha256 = "0a35vaq4l0d8vzw7hqpvbgkr3wj1sqr2zvj7bc5z4ikz2cppqj7p";

30
pkgs/desktops/xfce/applications/orage/default.nix
View File

@ -1,18 +1,23 @@
{ lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify, tzdata
, popt, libxfce4ui, xfce4-panel, withPanelPlugin ? true }:
{ stdenv, fetchurl, fetchpatch, pkg-config, intltool, dbus-glib, gtk2, libical, libnotify, tzdata
, popt, libxfce4ui, xfce4-panel, withPanelPlugin ? true, wrapGAppsHook, xfce }:
assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null;
let
inherit (lib) optionals;
inherit (stdenv.lib) optionals;
in
mkXfceDerivation {
category = "archive";
stdenv.mkDerivation rec {
pname = "orage";
version = "4.12.1";
sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m";
src = fetchurl {
url = "https://archive.xfce.org/src/apps/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w";
};
nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];
buildInputs = [ dbus-glib gtk2 libical libnotify popt ]
++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ];
@ -33,7 +38,16 @@ mkXfceDerivation {
})
];
meta = {
description = "A simple calendar application with reminders";
passthru.updateScript = xfce.updateScript {
inherit pname version;
attrPath = "xfce.${pname}";
versionLister = xfce.archiveLister "apps" pname;
};
meta = with stdenv.lib; {
description = "Simple calendar application with reminders";
homepage = "https://git.xfce.org/archive/orage/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}

4
pkgs/desktops/xfce/core/xfwm4/default.nix
View File

@ -5,9 +5,9 @@
mkXfceDerivation {
category = "xfce";
pname = "xfwm4";
version = "4.14.5";
version = "4.14.6";
sha256 = "0xxprhs8g00ysrl25y6z9agih6wb7n29v5f5m2icaz7yjvj1k9iv";
sha256 = "1ml5b4nn8laqhjihfqqsbjn66525abhin5d32bplh1k9yfxw4xi4";
nativeBuildInputs = [ exo librsvg ];

14
pkgs/desktops/xfce/mkXfceDerivation.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }:
{ stdenv, fetchFromGitLab, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }:
{ category
, pname
@ -23,14 +23,16 @@ let
zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets;
template = rec {
name = "${pname}-${version}";
inherit pname version;
nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ];
buildInputs = [ hicolor-icon-theme ];
configureFlags = [ "--enable-maintainer-mode" ];
src = fetchgit {
url = "git://git.xfce.org/${category}/${pname}";
src = fetchFromGitLab {
domain = "gitlab.xfce.org";
owner = category;
repo = pname;
inherit rev sha256;
};
@ -41,11 +43,11 @@ let
passthru.updateScript = xfce.updateScript {
inherit pname version attrPath rev-prefix odd-unstable patchlevel-unstable;
versionLister = xfce.gitLister src.url;
versionLister = xfce.gitLister src.meta.homepage;
};
meta = with stdenv.lib; {
homepage = "https://git.xfce.org/${category}/${pname}/about";
homepage = "https://gitlab.xfce.org/${category}/${pname}/about";
license = licenses.gpl2; # some libraries are under LGPLv2+
platforms = platforms.linux;
};

37
pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
View File

@ -1,29 +1,36 @@
{ stdenv, pkgconfig, fetchFromGitHub, python2, vala_0_40
, gtk2, libwnck, libxfce4util, xfce4-panel, wafHook }:
{ stdenv, pkgconfig, fetchFromGitHub, python2, vala_0_46
, gtk3, libwnck3, libxfce4util, xfce4-panel, wafHook, xfce }:
stdenv.mkDerivation rec {
ver = "0.3.1";
rev = "07a23b3";
name = "xfce4-namebar-plugin-${ver}";
pname = "xfce4-namebar-plugin";
version = "1.0.0";
src = fetchFromGitHub {
owner = "TiZ-EX1";
repo = "xfce4-namebar-plugin";
rev = rev;
sha256 = "1sl4qmjywfvv53ch7hyfysjfd91zl38y7gdw2y3k69vkzd3h18ad";
owner = "HugLifeTiZ";
repo = pname;
rev = "v${version}";
sha256 = "0l70f6mzkscsj4wr43wp5c0l2qnf85vj24cv02bjrh3bzz6wkak8";
};
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ python2 vala_0_40 gtk2 libwnck libxfce4util xfce4-panel ];
nativeBuildInputs = [ pkgconfig vala_0_46 wafHook ];
buildInputs = [ gtk3 libwnck3 libxfce4util xfce4-panel ];
postPatch = ''
substituteInPlace src/preferences.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }"
substituteInPlace src/namebar.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }"
for f in src/preferences.vala src/namebar.vala; do
substituteInPlace $f --replace 'var dirs = Environment.get_system_data_dirs()' "string[] dirs = { \"$out/share\" }"
done
'';
passthru.updateScript = xfce.updateScript {
inherit pname version;
attrPath = "xfce.${pname}";
versionLister = xfce.gitLister src.meta.homepage;
rev-prefix = "v";
};
meta = with stdenv.lib; {
homepage = "https://github.com/TiZ-EX1/xfce4-namebar-plugin";
description = "A plugins which integrates titlebar and window controls into the xfce4-panel";
homepage = "https://github.com/HugLifeTiZ/xfce4-namebar-plugin";
description = "Plugin which integrates titlebar and window controls into the xfce4-panel";
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.volth ];

1
pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
View File

@ -5,6 +5,7 @@ mkXfceDerivation {
pname = "xfce4-whiskermenu-plugin";
version = "2.4.6";
rev-prefix = "v";
odd-unstable = false;
sha256 = "03asfaxqbhawzb3870az7qgid5y7cg3ip8h6r4z8kavcd0b7x4ii";
nativeBuildInputs = [ cmake ];

41
pkgs/development/python-modules/gpy/default.nix
View File

@ -1,5 +1,14 @@
{ stdenv, buildPythonPackage, fetchPypi
, numpy, scipy, six, paramz, nose, matplotlib, cython }:
{ stdenv
, buildPythonPackage
, fetchPypi
, numpy
, scipy
, six
, paramz
, matplotlib
, cython
, nose
}:
buildPythonPackage rec {
pname = "GPy";
@ -10,21 +19,35 @@ buildPythonPackage rec {
sha256 = "04faf0c24eacc4dea60727c50a48a07ddf9b5751a3b73c382105e2a31657c7ed";
};
# running tests produces "ImportError: cannot import name 'linalg_cython'"
# even though Cython has run
checkPhase = "nosetests -d";
doCheck = false;
buildInputs = [ cython ];
propagatedBuildInputs = [ numpy scipy six paramz matplotlib ];
checkInputs = [ nose ];
buildInputs = [ cython ];
# $ nosetests GPy/testing/*.py
# => Ran 483 tests in 112.146s (on 8 cores)
# So instead, run shorter set of tests
checkPhase = ''
nosetests GPy/testing/linalg_test.py
'';
propagatedBuildInputs = [ numpy scipy six paramz matplotlib ];
# Rebuild cython-generated .c files since the included
# ones were built with an older version of cython that is
# incompatible with python3.9
preBuild = ''
for fn in $(find . -name '*.pyx'); do
echo $fn | sed 's/\.\.pyx$/\.c/' | xargs ${cython}/bin/cython -3
done
'';
pythonImportsCheck = [
"GPy"
];
meta = with stdenv.lib; {
description = "Gaussian process framework in Python";
homepage = "https://sheffieldml.github.io/GPy";
license = licenses.bsd3;
maintainers = with maintainers; [ bcdarwin ];
broken = stdenv.isDarwin; # See inscrutable error message here: https://github.com/NixOS/nixpkgs/pull/107653#issuecomment-751527547
};
}

8
pkgs/development/python-modules/paramz/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator }:
{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }:
buildPythonPackage rec {
pname = "paramz";
@ -10,6 +10,12 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ numpy scipy six decorator ];
checkInputs = [ nose ];
# Ran 113 tests in 3.082s
checkPhase = ''
nosetests -v paramz/tests
'';
meta = with stdenv.lib; {
description = "Parameterization framework for parameterized model creation and handling";

28
pkgs/development/python-modules/pykka/default.nix
View File

@ -1,27 +1,21 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
}:
{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-mock }:
buildPythonPackage rec {
pname = "pykka";
version = "2.0.1";
pname = "Pykka";
version = "2.0.3";
src = fetchFromGitHub {
owner = "jodal";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "011rvv3vzj9rpwaq6vfpz9hfwm6gx1jmad4iri6z12g8nnlpydhs";
src = fetchPypi {
inherit pname version;
sha256 = "4b9d2363365b3455a0204bf163f09bd351d24b938c618c79d975a9510e128e95";
};
# There are no tests
doCheck = false;
checkInputs = [ pytestCheckHook pytest-mock ];
meta = with stdenv.lib; {
homepage = "http://www.pykka.org";
meta = with lib; {
homepage = "https://www.pykka.org/";
description = "A Python implementation of the actor model";
changelog = "https://github.com/jodal/pykka/blob/v${version}/docs/changes.rst";
maintainers = [ maintainers.marsam ];
license = licenses.asl20;
maintainers = [];
};
}

34
pkgs/misc/ptouch-print/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv
, fetchgit
, autoreconfHook
, gd
, libusb1
}:
stdenv.mkDerivation rec {
pname = "ptouch-print";
version = "1.4.3";
src = fetchgit {
url = "https://mockmoon-cybernetics.ch/cgi/cgit/linux/ptouch-print.git";
rev = "v${version}";
sha256 = "0i57asg2hj1nfwy5lcb0vhrpvb9dqfhf81vh4i929h1kiqhlw2hx";
};
nativeBuildInputs = [
autoreconfHook
];
buildInputs = [
gd
libusb1
];
meta = with stdenv.lib; {
description = "Command line tool to print labels on Brother P-Touch printers on Linux";
license = licenses.gpl3Plus;
homepage = "https://mockmoon-cybernetics.ch/computer/p-touch2430pc/";
maintainers = with maintainers; [ shamilton ];
platforms = platforms.linux;
};
}

12
pkgs/misc/vim-plugins/generated.nix
View File

@ -2146,6 +2146,18 @@ let
meta.homepage = "https://github.com/vim-scripts/mayansmoke/";
};
mkdx = buildVimPluginFrom2Nix {
pname = "mkdx";
version = "2020-10-12";
src = fetchFromGitHub {
owner = "SidOfc";
repo = "mkdx";
rev = "65f343251d99c20db9f22e9c836b709f249129f6";
sha256 = "06xz12h87wkcpn2w22k6m7gxshk5x75hg8ql9cmja89v0birsn0f";
};
meta.homepage = "https://github.com/SidOfc/mkdx/";
};
molokai = buildVimPluginFrom2Nix {
pname = "molokai";
version = "2015-11-11";

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -497,6 +497,7 @@ Shougo/vimproc.vim
Shougo/vimshell.vim
shumphrey/fugitive-gitlab.vim
sickill/vim-pasta
SidOfc/mkdx
simnalamburt/vim-mundo
SirVer/ultisnips
sjl/gundo.vim

33
pkgs/tools/audio/aucdtect/default.nix
View File

@ -1,33 +0,0 @@
{ stdenv, fetchurl, lib, rpmextract }:
with lib;
stdenv.mkDerivation rec {
pname = "aucdtect";
version = "0.8-2";
src = fetchurl {
url = "http://www.true-audio.com/ftp/${pname}-${version}.i586.rpm";
sha256 = "1lp5f0rq5b5n5il0c64m00gcfskarvgqslpryms9443d200y6mmd";
};
unpackCmd = "${rpmextract}/bin/rpmextract $src";
installPhase = ''
runHook preInstall
install -Dm755 local/bin/auCDtect $out/bin/aucdtect
runHook postInstall
'';
dontStrip = true;
meta = with stdenv.lib; {
description = "Verify authenticity of lossless audio files";
homepage = "http://tausoft.org";
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
};
}

23
pkgs/tools/networking/kapp/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kapp";
version = "0.35.0";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "carvel-kapp";
rev = "v${version}";
sha256 = "1i4hpqpbwqb0yg3rx4z733zfslq3svmahfr39ss1ydylsipl02mg";
};
vendorSha256 = null;
subPackages = [ "cmd/kapp" ];
meta = with lib; {
description = "CLI tool that encourages Kubernetes users to manage bulk resources with an application abstraction for grouping";
homepage = "https://get-kapp.io";
license = licenses.asl20;
maintainers = with maintainers; [ brodes ];
};
}

31
pkgs/tools/security/dnsx/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ buildGoModule
, fetchFromGitHub
, stdenv
}:
buildGoModule rec {
pname = "dnsx";
version = "1.0.1";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "dnsx";
rev = "v${version}";
sha256 = "1pgq21pbnz2dm272zrhd455njj5vg4kywpd230acj675nlgir6y1";
};
vendorSha256 = "0j2cqvskzxbyfrvsv4gm4qwfjm0digizcg157z5iignnknddajax";
meta = with stdenv.lib; {
description = "Fast and multi-purpose DNS toolkit";
longDescription = ''
dnsx is a fast and multi-purpose DNS toolkit allow to run multiple
probers using retryabledns library, that allows you to perform
multiple DNS queries of your choice with a list of user supplied
resolvers.
'';
homepage = "https://github.com/projectdiscovery/dnsx";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

36
pkgs/tools/security/nuclei/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ buildGoModule
, fetchFromGitHub
, stdenv
}:
buildGoModule rec {
pname = "nuclei";
version = "2.2.0";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "nuclei";
rev = "v${version}";
sha256 = "0xrvza86aczlnb11x58fiqch5g0q6gvpxwsi5dq3akfi95gk3a3x";
};
vendorSha256 = "1v3ax8l1lgp2vs50gsa2fhdd6bvyfdlkd118akrqmwxahyyyqycv";
preBuild = ''
mv v2/* .
'';
meta = with stdenv.lib; {
description = "Tool for configurable targeted scanning";
longDescription = ''
Nuclei is used to send requests across targets based on a template
leading to zero false positives and providing effective scanning
for known paths. Main use cases for nuclei are during initial
reconnaissance phase to quickly check for low hanging fruits or
CVEs across targets that are known and easily detectable.
'';
homepage = "https://github.com/projectdiscovery/nuclei";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

1
pkgs/top-level/aliases.nix
View File

@ -61,6 +61,7 @@ mapAliases ({
asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # added 2020-10-07
at_spi2_atk = at-spi2-atk; # added 2018-02-25
at_spi2_core = at-spi2-core; # added 2018-02-25
aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # added 2020-12-26
avldrums-lv2 = x42-avldrums; # added 2020-03-29
bar-xft = lemonbar-xft; # added 2015-01-16
bashCompletion = bash-completion; # Added 2016-09-28

14
pkgs/top-level/all-packages.nix
View File

@ -222,6 +222,8 @@ in
ptags = callPackage ../development/tools/misc/ptags { };
ptouch-print = callPackage ../misc/ptouch-print { };
demoit = callPackage ../servers/demoit { };
deviceTree = callPackage ../os-specific/linux/device-tree {};
@ -3381,6 +3383,8 @@ in
dnstop = callPackage ../tools/networking/dnstop { };
dnsx = callPackage ../tools/security/dnsx { };
dhcp = callPackage ../tools/networking/dhcp { };
dhcpdump = callPackage ../tools/networking/dhcpdump { };
@ -5252,6 +5256,8 @@ in
lvmsync = callPackage ../tools/backup/lvmsync { };
kapp = callPackage ../tools/networking/kapp {};
kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { };
kippo = callPackage ../servers/kippo { };
@ -19949,6 +19955,8 @@ in
nuclear = callPackage ../applications/audio/nuclear { };
nuclei = callPackage ../tools/security/nuclei { };
nullmailer = callPackage ../servers/mail/nullmailer {
stdenv = gccStdenv;
};
@ -24541,6 +24549,10 @@ in
twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { };
terminal-typeracer = callPackage ../applications/misc/terminal-typeracer {
inherit (darwin.apple_sdk.frameworks) Security;
};
ueberzug = with python3Packages; toPythonApplication ueberzug;
uhhyou.lv2 = callPackage ../applications/audio/uhhyou.lv2 { };
@ -28781,8 +28793,6 @@ in
mpvc = callPackage ../applications/misc/mpvc { };
aucdtect = callPackage ../tools/audio/aucdtect { };
togglesg-download = callPackage ../tools/misc/togglesg-download { };
discord = import ../applications/networking/instant-messengers/discord {