Merge staging-next into staging
This commit is contained in:
commit
f50f916355
|
@ -1,5 +1,5 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub, pkg-config, qmake
|
||||
, python2, qtbase, qttools }:
|
||||
, python3, qtbase, qttools }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "tiled";
|
||||
|
@ -13,7 +13,7 @@ mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
buildInputs = [ python2 qtbase qttools ];
|
||||
buildInputs = [ python3 qtbase qttools ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free, easy to use and flexible tile map editor";
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
{ callPackage
|
||||
, buildGoPackage
|
||||
, nvidia_x11
|
||||
, nvidiaGpuSupport
|
||||
}:
|
||||
|
||||
callPackage ./generic.nix {
|
||||
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
|
||||
version = "1.0.13";
|
||||
sha256 = "19wlma2y8lpb7p01wb0l20rb6nvrvldz0mm3qfisx33y56ykjyh8";
|
||||
}
|
|
@ -4,7 +4,7 @@
|
|||
, nvidiaGpuSupport
|
||||
}:
|
||||
|
||||
callPackage ./genericModule.nix {
|
||||
callPackage ./generic.nix {
|
||||
inherit buildGoModule nvidia_x11 nvidiaGpuSupport;
|
||||
version = "1.1.8";
|
||||
sha256 = "05k1r157h3jaqzzsrkgc96zcny3mi8dvixc2v1w0lwcxixqk0y2l";
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
, nvidiaGpuSupport
|
||||
}:
|
||||
|
||||
callPackage ./genericModule.nix {
|
||||
callPackage ./generic.nix {
|
||||
inherit buildGoModule nvidia_x11 nvidiaGpuSupport;
|
||||
version = "1.2.3";
|
||||
sha256 = "0qjj1pnq2yv4r8dv03m08ii4118drjnswf4n1r95dqh8j3bymv5i";
|
||||
|
|
|
@ -1,27 +1,30 @@
|
|||
{ lib
|
||||
, buildGoPackage
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, version
|
||||
, sha256
|
||||
, vendorSha256
|
||||
, nvidiaGpuSupport
|
||||
, patchelf
|
||||
, nvidia_x11
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "nomad";
|
||||
inherit version;
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/hashicorp/nomad";
|
||||
subPackages = [ "." ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
inherit rev sha256;
|
||||
rev = "v${version}";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
inherit vendorSha256;
|
||||
|
||||
nativeBuildInputs = lib.optionals nvidiaGpuSupport [
|
||||
patchelf
|
||||
];
|
||||
|
@ -39,6 +42,8 @@ buildGoPackage rec {
|
|||
done
|
||||
'';
|
||||
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.nomadproject.io/";
|
||||
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
|
||||
|
|
|
@ -1,54 +0,0 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, version
|
||||
, sha256
|
||||
, vendorSha256
|
||||
, nvidiaGpuSupport
|
||||
, patchelf
|
||||
, nvidia_x11
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nomad";
|
||||
inherit version;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
inherit vendorSha256;
|
||||
|
||||
nativeBuildInputs = lib.optionals nvidiaGpuSupport [
|
||||
patchelf
|
||||
];
|
||||
|
||||
# ui:
|
||||
# Nomad release commits include the compiled version of the UI, but the file
|
||||
# is only included if we build with the ui tag.
|
||||
tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia";
|
||||
|
||||
# The dependency on NVML isn't explicit. We have to make it so otherwise the
|
||||
# binary will not know where to look for the relevant symbols.
|
||||
postFixup = lib.optionalString nvidiaGpuSupport ''
|
||||
for bin in $out/bin/*; do
|
||||
patchelf --add-needed "${nvidia_x11}/lib/libnvidia-ml.so" "$bin"
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.nomadproject.io/";
|
||||
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey ];
|
||||
};
|
||||
}
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
# the gstreamer toolsdir points to the wrong derivation output
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace '$gst10_toolsdir/gst-inspect-1.0' '${gstreamer.dev}/bin/gst-inspect-1.0' \
|
||||
--replace '$gst10_toolsdir/gst-inspect-1.0' '${gstreamer}/bin/gst-inspect-1.0' \
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dlib";
|
||||
version = "19.22";
|
||||
version = "19.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davisking";
|
||||
repo = "dlib";
|
||||
rev ="v${version}";
|
||||
sha256 = "sha256-cEbw01w4KgSG3JTvTE/qruo7i4/L++m02HW+0VNmSSQ=";
|
||||
sha256 = "sha256-88vusoLEkjh3WRh/PxPtsVIFk85serRq2VxVcEus3IE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -33,7 +33,7 @@ with lib;
|
|||
let
|
||||
# Release calendar: https://www.mesa3d.org/release-calendar.html
|
||||
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
|
||||
version = "21.3.4";
|
||||
version = "21.3.5";
|
||||
branch = versions.major version;
|
||||
|
||||
self = stdenv.mkDerivation {
|
||||
|
@ -47,7 +47,7 @@ self = stdenv.mkDerivation {
|
|||
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
|
||||
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
|
||||
];
|
||||
sha256 = "0zd6skf9qcwlk1k1ljgwijwlyz5si3pgi0h97gd6kkivm7a4y43p";
|
||||
sha256 = "0k2ary16ixsrp65m2n5djpr51nbwdgzpv81pfrnqbvk44jfjlfyr";
|
||||
};
|
||||
|
||||
# TODO:
|
||||
|
|
|
@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ];
|
||||
|
||||
buildInputs = [
|
||||
libGL wayland wayland-protocols libinput libxkbcommon pixman
|
||||
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
|
||||
libpng ffmpeg xcbutilrenderutil seatd vulkan-loader glslang
|
||||
libpng ffmpeg xcbutilrenderutil seatd vulkan-loader
|
||||
]
|
||||
++ lib.optional enableXWayland xwayland
|
||||
;
|
||||
|
|
|
@ -0,0 +1,68 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, requests
|
||||
, appdirs
|
||||
, tabulate
|
||||
, msgpack
|
||||
, orjson
|
||||
, semver
|
||||
, packageurl-python
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "appthreat-vulnerability-db";
|
||||
version = "2.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AppThreat";
|
||||
repo = "vulnerability-db";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fqpBnxcRBBXsjJepxDuoDbT3hk5rXAvky11sIvQS9XI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
appdirs
|
||||
tabulate
|
||||
msgpack
|
||||
orjson
|
||||
semver
|
||||
packageurl-python
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace " --cov-append --cov-report term --cov vdb" ""
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test_bulk_search"
|
||||
"test_download_recent"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"vdb"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Vulnerability database and package search for sources such as OSV, NVD, GitHub and npm";
|
||||
homepage = "https://github.com/appthreat/vulnerability-db";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -10,17 +10,21 @@
|
|||
, pytest-mock
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dash";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plotly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0RvA5qkwQJGyy81D5kW+IR6LbaD/KBwMy6kYxTETubg=";
|
||||
sha256 = "sha256-qEHB90xzettkX/9ojCQ8AZYnTJaL+8n87SmlBOBSDWQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "databricks-connect";
|
||||
version = "9.1.7";
|
||||
version = "9.1.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2d4712b190c9df3459432af8c16f7b9c33ebc3394c1f9811a70717b530467a41";
|
||||
sha256 = "sha256-gSclZatH5r3r6o8K2gXaNlkowQxFT7h0t/0ubr3d0n0=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "0.27.2";
|
||||
version = "0.28.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-XBGA3wRZdl8rJ1hLLPPLK7E87Ggoly+kePbLY4x9/ZE=";
|
||||
sha256 = "sha256-zYSJMP/uwgyIHdI8E7NHLaHrpAQeLpaEcXXXlzIO5ns=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.4.5";
|
||||
version = "2.4.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "pre-commit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VXQ9lyouwAuw2iGr1m/2KFklUFgmQOP2/gwInATKB4k=";
|
||||
sha256 = "sha256-ZOvp7vCvAf0AFtHogUwuUqDc5wfdXQHHJwl+4F/AI+g=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "minikerberos";
|
||||
version = "0.2.15";
|
||||
version = "0.2.16";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "20fae3cf1b329451eb3cba55d6b3c5b44501db5a23e49f47bc770e7461308672";
|
||||
sha256 = "sha256-66idXGSSQaM2eDnr0cAzO5qeT+UUdG4kamofLLe94m4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-gitlab";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7216c9100b2a17cae5cf53b4b40ee36a7262d4ead7526c5a6278d911eba74847";
|
||||
sha256 = "sha256-ytEzjB/xp5GnuueZXcYh4mx3378iW63kVqzsdRJ4KCU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "simplisafe-python";
|
||||
version = "2021.12.2";
|
||||
version = "2022.01.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-XVSoPPBdjSQBYrUs0AFGsGFRrQOWbPzlB2mmEBSbFI4=";
|
||||
sha256 = "sha256-dU7zyLSqUX4AM1MLaF9zHbbc2EfsJDtzIwmzy/xiLu8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
52
pkgs/development/tools/appthreat-depscan/default.nix
Normal file
52
pkgs/development/tools/appthreat-depscan/default.nix
Normal file
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "appthreat-depscan";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AppThreat";
|
||||
repo = "dep-scan";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HCOS8/jn7BOzDwSpenVGo6QpI/1ey6L1zBucTyqsSY4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
appthreat-vulnerability-db
|
||||
defusedxml
|
||||
pyyaml
|
||||
rich
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace " --cov-append --cov-report term --cov depscan" ""
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# Assertion Error
|
||||
"test_query_metadata2"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"depscan"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to audit dependencies based on known vulnerabilities and advisories";
|
||||
homepage = "https://github.com/AppThreat/dep-scan";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -1,9 +1,9 @@
|
|||
{ stdenv, lib
|
||||
, kernel
|
||||
, fetchurl
|
||||
, pkg-config, meson, ninja
|
||||
, pkg-config, meson, ninja, makeWrapper
|
||||
, libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap, rdma-core
|
||||
, doxygen, python3
|
||||
, doxygen, python3, pciutils
|
||||
, withExamples ? []
|
||||
, shared ? false }:
|
||||
|
||||
|
@ -20,6 +20,7 @@ in stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
doxygen
|
||||
meson
|
||||
ninja
|
||||
|
@ -31,22 +32,27 @@ in stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
jansson
|
||||
libbpf
|
||||
libbsd
|
||||
libelf
|
||||
libpcap
|
||||
numactl
|
||||
openssl.dev
|
||||
zlib
|
||||
python3
|
||||
] ++ lib.optionals mod kernel.moduleBuildDependencies;
|
||||
|
||||
# Propagated to support current DPDK users in nixpkgs which statically link
|
||||
# with the framework (e.g. odp-dpdk).
|
||||
propagatedBuildInputs = [
|
||||
# Propagated to support current DPDK users in nixpkgs which statically link
|
||||
# with the framework (e.g. odp-dpdk).
|
||||
rdma-core
|
||||
# Requested by pkg-config.
|
||||
libbsd
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs config/arm buildtools
|
||||
'' + lib.optionalString mod ''
|
||||
# kernel_install_dir is hardcoded to `/lib/modules`; patch that.
|
||||
sed -i "s,kernel_install_dir *= *['\"].*,kernel_install_dir = '$kmod/lib/modules/${kernel.modDirVersion}'," kernel/linux/meson.build
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
|
@ -59,30 +65,25 @@ in stdenv.mkDerivation rec {
|
|||
++ lib.optional (!shared) "-Ddefault_library=static"
|
||||
++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem"
|
||||
++ lib.optional stdenv.isAarch64 "-Dmachine=generic"
|
||||
++ lib.optional mod "-Dkernel_dir=${placeholder "kmod"}/lib/modules/${kernel.modDirVersion}"
|
||||
++ lib.optional mod "-Dkernel_dir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}";
|
||||
|
||||
# dpdk meson script does not support separate kernel source and installion
|
||||
# dirs (except via destdir), so we temporarily link the former into the latter.
|
||||
preConfigure = lib.optionalString mod ''
|
||||
mkdir -p $kmod/lib/modules/${kernel.modDirVersion}
|
||||
ln -sf ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \
|
||||
$kmod/lib/modules/${kernel.modDirVersion}
|
||||
'';
|
||||
|
||||
postBuild = lib.optionalString mod ''
|
||||
rm -f $kmod/lib/modules/${kernel.modDirVersion}/build
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Remove Sphinx cache files. Not only are they not useful, but they also
|
||||
# contain store paths causing spurious dependencies.
|
||||
rm -rf $out/share/doc/dpdk/html/.doctrees
|
||||
|
||||
wrapProgram $out/bin/dpdk-devbind.py \
|
||||
--prefix PATH : "${lib.makeBinPath [ pciutils ]}"
|
||||
'' + lib.optionalString (withExamples != []) ''
|
||||
find examples -type f -executable -exec install {} $out/bin \;
|
||||
mkdir -p $examples/bin
|
||||
find examples -type f -executable -exec install {} $examples/bin \;
|
||||
'';
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional mod "kmod";
|
||||
outputs =
|
||||
[ "out" "doc" ]
|
||||
++ lib.optional mod "kmod"
|
||||
++ lib.optional (withExamples != []) "examples";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Set of libraries and drivers for fast packet processing";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "agate";
|
||||
version = "3.1.0";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mbrubeck";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-miIMz4Lk4R5So96Ceqe1Fl5ozpf47qWq0GgtKFDDCCA=";
|
||||
sha256 = "sha256-o4tjEIgDTj2EUbfaKCHZfvEKCwxNpsabU437kU+Vpnk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-NZpqCl37dZUvXmn4Q1Pvbz3LSxk1s0s5x1CBO0POA/4=";
|
||||
cargoSha256 = "sha256-rE0I13dKbGgJmh6vF/cWvIZfqtKzzgn7pTiB3HJ7cgY=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3
|
||||
, pcre, liblinear, libssh2
|
||||
, pcre, libssh2
|
||||
, graphicalSupport ? false
|
||||
, libX11 ? null
|
||||
, gtk2 ? null
|
||||
|
@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = [
|
||||
(if withLua then "--with-liblua=${lua5_3}" else "--without-liblua")
|
||||
"--with-liblinear=included"
|
||||
] ++ optionals (!graphicalSupport) [ "--without-ndiff" "--without-zenmap" ];
|
||||
|
||||
makeFlags = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
|
@ -53,7 +54,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ];
|
||||
buildInputs = [ pcre liblinear libssh2 libpcap openssl ] ++ optionals graphicalSupport (with python2.pkgs; [
|
||||
buildInputs = [ pcre libssh2 libpcap openssl ] ++ optionals graphicalSupport (with python2.pkgs; [
|
||||
python2 libX11 gtk2
|
||||
]);
|
||||
|
||||
|
|
|
@ -200,6 +200,8 @@ with pkgs;
|
|||
|
||||
fission = callPackage ../development/tools/fission { };
|
||||
|
||||
appthreat-depscan = callPackage ../development/tools/appthreat-depscan { };
|
||||
|
||||
authy = callPackage ../applications/misc/authy { };
|
||||
|
||||
avro-tools = callPackage ../development/tools/avro-tools { };
|
||||
|
@ -1764,7 +1766,7 @@ with pkgs;
|
|||
genymotion = callPackage ../development/mobile/genymotion { };
|
||||
|
||||
galene = callPackage ../servers/web-apps/galene {
|
||||
buildGoModule = buildGo115Module;
|
||||
buildGoModule = buildGo117Module;
|
||||
};
|
||||
|
||||
gamecube-tools = callPackage ../development/tools/gamecube-tools { };
|
||||
|
@ -8089,11 +8091,6 @@ with pkgs;
|
|||
# with different versions we pin Go for all versions.
|
||||
# Upstream partially documents used Go versions here
|
||||
# https://github.com/hashicorp/nomad/blob/master/contributing/golang.md
|
||||
nomad_1_0 = callPackage ../applications/networking/cluster/nomad/1.0.nix {
|
||||
buildGoPackage = buildGo115Package;
|
||||
inherit (linuxPackages) nvidia_x11;
|
||||
nvidiaGpuSupport = config.cudaSupport or false;
|
||||
};
|
||||
nomad_1_1 = callPackage ../applications/networking/cluster/nomad/1.1.nix {
|
||||
buildGoModule = buildGo116Module;
|
||||
inherit (linuxPackages) nvidia_x11;
|
||||
|
@ -20232,7 +20229,7 @@ with pkgs;
|
|||
triehash = callPackage ../tools/misc/triehash { };
|
||||
|
||||
trillian = callPackage ../tools/misc/trillian {
|
||||
buildGoModule = buildGo115Module;
|
||||
buildGoModule = buildGo117Module;
|
||||
};
|
||||
|
||||
twolame = callPackage ../development/libraries/twolame { };
|
||||
|
@ -26784,7 +26781,7 @@ with pkgs;
|
|||
kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { };
|
||||
|
||||
kuttl = callPackage ../applications/networking/cluster/kuttl {
|
||||
buildGoModule = buildGo115Module;
|
||||
buildGoModule = buildGo117Module;
|
||||
};
|
||||
|
||||
kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { };
|
||||
|
|
|
@ -288,6 +288,8 @@ in {
|
|||
|
||||
dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { };
|
||||
|
||||
dpdk = pkgs.dpdk.override { inherit kernel; };
|
||||
|
||||
exfat-nofuse = callPackage ../os-specific/linux/exfat { };
|
||||
|
||||
evdi = callPackage ../os-specific/linux/evdi { };
|
||||
|
|
|
@ -566,6 +566,8 @@ in {
|
|||
|
||||
apptools = callPackage ../development/python-modules/apptools { };
|
||||
|
||||
appthreat-vulnerability-db = callPackage ../development/python-modules/appthreat-vulnerability-db { };
|
||||
|
||||
aprslib = callPackage ../development/python-modules/aprslib { };
|
||||
|
||||
APScheduler = callPackage ../development/python-modules/APScheduler { };
|
||||
|
|
Loading…
Reference in a new issue