mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 05:43:50 +03:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
998be46bd6
27
nixos/modules/hardware/keyboard/zsa.nix
Normal file
27
nixos/modules/hardware/keyboard/zsa.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) mkOption mkIf types;
|
||||
cfg = config.hardware.keyboard.zsa;
|
||||
in
|
||||
{
|
||||
# TODO: make group configurable like in https://github.com/NixOS/nixpkgs/blob/0b2b4b8c4e729535a61db56468809c5c2d3d175c/pkgs/tools/security/nitrokey-app/udev-rules.nix ?
|
||||
options.hardware.keyboard.zsa = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enables udev rules for keyboards from ZSA like the ErgoDox EZ, Planck EZ and Moonlander Mark I.
|
||||
You need it when you want to flash a new configuration on the keyboard
|
||||
or use their live training in the browser.
|
||||
Access to the keyboard is granted to users in the "plugdev" group.
|
||||
You may want to install the wally-cli package.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.udev.packages = [ pkgs.zsa-udev-rules ];
|
||||
users.groups.plugdev = {};
|
||||
};
|
||||
}
|
||||
@ -47,6 +47,7 @@
|
||||
./hardware/digitalbitbox.nix
|
||||
./hardware/device-tree.nix
|
||||
./hardware/sensor/iio.nix
|
||||
./hardware/keyboard/zsa.nix
|
||||
./hardware/ksm.nix
|
||||
./hardware/ledger.nix
|
||||
./hardware/logitech.nix
|
||||
|
||||
2309
pkgs/applications/audio/netease-music-tui/cargo-lock.patch
Normal file
2309
pkgs/applications/audio/netease-music-tui/cargo-lock.patch
Normal file
File diff suppressed because it is too large
Load Diff
28
pkgs/applications/audio/netease-music-tui/default.nix
Normal file
28
pkgs/applications/audio/netease-music-tui/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ fetchFromGitHub, rustPlatform, lib, alsaLib, pkg-config, openssl }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "netease-music-tui";
|
||||
version = "v0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "betta-cyber";
|
||||
repo = "netease-music-tui";
|
||||
rev = "${version}";
|
||||
sha256 = "0m5b3q493d32kxznm4apn56216l07b1c49km236i03mpfvdw7m1f";
|
||||
};
|
||||
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ alsaLib openssl ];
|
||||
|
||||
cargoSha256 = "1kfbnwy3lkbhz0ggxwr5n6qd1plipkr1ycr3z2r7c0amrzzbkc7l";
|
||||
verifyCargoDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/betta-cyber/netease-music-tui";
|
||||
description = "netease cloud music terminal client by rust";
|
||||
maintainers = with maintainers; [ vonfry ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
@ -38,13 +38,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.115.0";
|
||||
version = "1.118.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
sha256 = "0q7gfpzc97fvyvabjdb9a4d3c2qhm4zf5bqgnsj73vkly80kgww8";
|
||||
sha256 = "0d6f4qfs7vifz7qkw2vkdjgd5w717wfpnxbc4qa4hs4g6y86ywmm";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -106,6 +106,7 @@ stdenv.mkDerivation rec {
|
||||
Search and replace with RegEx. Extendable by Python plugins and themes.
|
||||
'';
|
||||
homepage = "http://www.uvviewsoft.com/cudatext/";
|
||||
changelog = "http://uvviewsoft.com/cudatext/history.txt";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -11,18 +11,18 @@
|
||||
},
|
||||
"ATFlatControls": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2020.09.20",
|
||||
"sha256": "09svn8yyqp6znvfpcxrsybkclh828h5rvah7nhbhk7nrfzj8i63x"
|
||||
"rev": "2020.11.02",
|
||||
"sha256": "0shihlm1hg74m04qyrj2iic2ik0x7qggihmnylvvdry3y79d07fy"
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2020.10.12",
|
||||
"sha256": "07vznwwfa3c1jr1cd32yppw0mmmm1ja9bmsxhxlcbnc2nb30n9zr"
|
||||
"rev": "6560bc35a2cf31399be8713ac189216afabf9f01",
|
||||
"sha256": "1bjnd6pcd9ddkvl7ma05z7f8svq609kljwc7gvbszc76hdb8d54x"
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2020.10.11",
|
||||
"sha256": "11vx685i85izp7wzb34dalcwlkmkbz1vzva5j9cf2yz1jff1v4qw"
|
||||
"rev": "2459ea2a2e50050f7e6ee59a17a52aae05ca4433",
|
||||
"sha256": "155cwcmr9f23j4x13pidvb3vcgglawkxxpizjw90ajwhmg831acr"
|
||||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
@ -36,8 +36,8 @@
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2020.07.31",
|
||||
"sha256": "0qbs51h6gw8qd3h06kwy1j7db35shbg7r2rayrhvvw0vzr9n330j"
|
||||
"rev": "2020.10.23",
|
||||
"sha256": "1lljldqnixlh0j05fh594gccwzkgcxa50byq8wr9ld5ik5sf8khn"
|
||||
},
|
||||
"Emmet-Pascal": {
|
||||
"owner": "Alexey-T",
|
||||
@ -51,7 +51,7 @@
|
||||
},
|
||||
"bgrabitmap": {
|
||||
"owner": "bgrabitmap",
|
||||
"rev": "v11.2.4",
|
||||
"sha256": "1zk88crfn07md16wg6af4i8nlx4ikkhxq9gfk49jirwimgwbf1md"
|
||||
"rev": "v11.3.1",
|
||||
"sha256": "1f95rdpfwqy9fipzybi17nbhq46zj45yjps21p2hplhinrr49n2p"
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ciscomobilityexpress";
|
||||
version = "0.3.9";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0kj0i1963afxqw9apk0yxzj1f7kpi1949ggnkzkb8v90kxpgymma";
|
||||
sha256 = "fd3fe893d8a44f5ac1d46580af88e07f1066e73744763aca4ef2226f87d575ff";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
, python-baseconv
|
||||
, pyyaml
|
||||
, uvicorn
|
||||
, httpx
|
||||
# Check Inputs
|
||||
, pytestCheckHook
|
||||
, pytestrunner
|
||||
@ -26,13 +27,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datasette";
|
||||
version = "0.46";
|
||||
version = "0.53";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simonw";
|
||||
repo = "datasette";
|
||||
rev = version;
|
||||
sha256 = "0g4dfq5ykifa9628cb4i7gvx98p8hvb99gzfxk3bkvq1v9p4kcqq";
|
||||
sha256 = "1rsgxkvav1qy2ia2csm1jvabd8klh3ly8719979gdlx2il1cjjkz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytestrunner ];
|
||||
@ -52,6 +53,8 @@ buildPythonPackage rec {
|
||||
pyyaml
|
||||
uvicorn
|
||||
setuptools
|
||||
httpx
|
||||
asgiref
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
@ -59,7 +62,6 @@ buildPythonPackage rec {
|
||||
pytest-asyncio
|
||||
aiohttp
|
||||
beautifulsoup4
|
||||
asgiref
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
@ -75,9 +77,9 @@ buildPythonPackage rec {
|
||||
|
||||
# takes 30-180 mins to run entire test suite, not worth the cpu resources, slows down reviews
|
||||
# with pytest-xdist, it still takes around 10mins with 32 cores
|
||||
# just run the messages tests, as this should give some indictation of correctness
|
||||
# just run the csv tests, as this should give some indictation of correctness
|
||||
pytestFlagsArray = [
|
||||
"tests/test_messages.py"
|
||||
"tests/test_csv.py"
|
||||
];
|
||||
disabledTests = [
|
||||
"facet"
|
||||
|
||||
@ -2,19 +2,18 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, django
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-contrib-comments";
|
||||
version = "1.9.2";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d1232bade3094de07dcc205fc833204384e71ba9d30caadcb5bb2882ce8e8d31";
|
||||
sha256 = "26350b2c353816570a74b7fb19c558ce00288625ac32886a5274f4f931c098f9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django six ];
|
||||
propagatedBuildInputs = [ django ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/django/django-contrib-comments";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Flask-Testing";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1rkkqgmrzmhpv6y1xysqh0ij03xniic8h631yvghksqwxd9vyjfq";
|
||||
sha256 = "0a734d7b68e63a9410b413cd7b1f96456f9a858bd09a6222d465650cc782eb01";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
, sympy
|
||||
, matplotlib
|
||||
, reportlab
|
||||
, sphinx
|
||||
, pytest
|
||||
, pytest-randomly
|
||||
, glibcLocales
|
||||
@ -19,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fonttools";
|
||||
version = "4.14.0";
|
||||
version = "4.18.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0aiaxjg2v2391gxnhp4nvmgfb3ygm6x7n080s5mnkfjq2bq319in";
|
||||
sha256 = "0h750gvwpsp7fpmgfwkx93gkaf0m1s698g6r7n4xlaji563nlkiv";
|
||||
};
|
||||
|
||||
# all dependencies are optional, but
|
||||
@ -53,6 +54,7 @@ buildPythonPackage rec {
|
||||
matplotlib
|
||||
# pens
|
||||
reportlab
|
||||
sphinx
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
||||
@ -2,21 +2,21 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "tfsec";
|
||||
version = "0.27.0";
|
||||
version = "0.36.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liamg";
|
||||
owner = "tfsec";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "12n6l18g0kg28clzyzwc2lq9rnch3vshp07isgvfp7193bhf8hyv";
|
||||
sha256 = "11kv13d4cw515r79azfha1ksmvsha1rvg0jak9nvz9ggivyn0s7a";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/liamg/tfsec";
|
||||
goPackagePath = "github.com/tfsec/tfsec";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/liamg/tfsec";
|
||||
homepage = "https://github.com/tfsec/tfsec";
|
||||
description = "Static analysis powered security scanner for your terraform code";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
|
||||
@ -1,52 +1,61 @@
|
||||
{ buildPythonApplication, lib, fetchPypi, isPy3k, fetchpatch
|
||||
, cli-helpers, click, configobj, humanize, prompt_toolkit, psycopg2
|
||||
, pygments, sqlparse, pgspecial, setproctitle, keyring, pytest, mock
|
||||
{ stdenv
|
||||
, buildPythonApplication
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, cli-helpers
|
||||
, click
|
||||
, configobj
|
||||
, humanize
|
||||
, prompt_toolkit
|
||||
, psycopg2
|
||||
, pygments
|
||||
, sqlparse
|
||||
, pgspecial
|
||||
, setproctitle
|
||||
, keyring
|
||||
, pendulum
|
||||
, pytestCheckHook
|
||||
, mock
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "pgcli";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "10j01bd031fys1vcihibsi5rrfd8w1kgahpcsbk4l07871c24829";
|
||||
sha256 = "d5b2d803f7e4e7fe679306a000bde5d14d15ec590ddd108f3dc4c0ecad169d2b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cli-helpers click configobj humanize prompt_toolkit psycopg2
|
||||
pygments sqlparse pgspecial setproctitle keyring
|
||||
cli-helpers
|
||||
click
|
||||
configobj
|
||||
humanize
|
||||
prompt_toolkit
|
||||
psycopg2
|
||||
pygments
|
||||
sqlparse
|
||||
pgspecial
|
||||
setproctitle
|
||||
keyring
|
||||
pendulum
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "enable-sqlparse-4.patch";
|
||||
url = "https://github.com/dbcli/pgcli/pull/1224/commits/55d534d41051887c637b6300e08a9f70e6656020.patch";
|
||||
sha256 = "01r8qc7qzb6mz0xq2xnrgyackbapf43ng6l88qpzd9lw2pwksc8w";
|
||||
includes = [ "pgcli/packages/parseutils/ctes.py" "tests/test_sqlcompletion.py" "setup.py" ];
|
||||
})
|
||||
];
|
||||
checkInputs = [ pytestCheckHook mock ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "prompt_toolkit>=2.0.6,<3.0.0" "prompt_toolkit"
|
||||
'';
|
||||
disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ];
|
||||
|
||||
checkInputs = [ pytest mock ];
|
||||
|
||||
# `test_application_name_db_uri` fails: https://github.com/dbcli/pgcli/issues/1104
|
||||
checkPhase = ''
|
||||
pytest --deselect=tests/test_main.py::test_application_name_db_uri
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Command-line interface for PostgreSQL";
|
||||
longDescription = ''
|
||||
Rich command-line interface for PostgreSQL with auto-completion and
|
||||
syntax highlighting.
|
||||
'';
|
||||
homepage = "https://pgcli.com";
|
||||
changelog = "https://github.com/dbcli/pgcli/blob/v${version}/changelog.rst";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ dywedir ];
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "raspberrypi-tools";
|
||||
@ -13,6 +13,14 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/raspberrypi/userland/pull/670
|
||||
url = "https://github.com/raspberrypi/userland/pull/670/commits/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch";
|
||||
sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
cmakeFlagsArray+=("-DVMCS_INSTALL_PREFIX=$out")
|
||||
'' + stdenv.lib.optionalString stdenv.isAarch64 ''
|
||||
@ -23,7 +31,7 @@ stdenv.mkDerivation {
|
||||
description = "Userland tools for the Raspberry Pi board";
|
||||
homepage = "https://github.com/raspberrypi/userland";
|
||||
license = licenses.bsd3;
|
||||
platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
|
||||
platforms = [ "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ dezgeg tavyc ];
|
||||
};
|
||||
}
|
||||
|
||||
33
pkgs/os-specific/linux/zsa-udev-rules/default.nix
Normal file
33
pkgs/os-specific/linux/zsa-udev-rules/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "zsa-udev-rules";
|
||||
version = "unstable-2020-12-16";
|
||||
|
||||
# TODO: use version and source from nixpkgs/pkgs/development/tools/wally-cli/default.nix after next release
|
||||
src = fetchFromGitHub {
|
||||
owner = "zsa";
|
||||
repo = "wally";
|
||||
rev = "e5dde3c700beab39fb941c6941e55535bf9b2af6";
|
||||
sha256 = "0pkybi32r1hrmpa1mc8qlzhv7xy5n5rr5ah25lbr0cipp1bda417";
|
||||
};
|
||||
|
||||
# it only installs files
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
dontFixup = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/udev/rules.d
|
||||
cp dist/linux64/50-oryx.rules $out/lib/udev/rules.d/
|
||||
cp dist/linux64/50-wally.rules $out/lib/udev/rules.d/
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "udev rules for ZSA devices";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ davidak ];
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://github.com/zsa/wally/wiki/Linux-install#2-create-a-udev-rule-file";
|
||||
};
|
||||
}
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slurm";
|
||||
version = "20.11.0.1";
|
||||
version = "20.11.2.1";
|
||||
|
||||
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
|
||||
# because the latter does not keep older releases.
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "slurm";
|
||||
# The release tags use - instead of .
|
||||
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
|
||||
sha256 = "0f750wlvm48j5b2fkvhy47zyagxfl6kbn2m9lx0spxwyn9qgh6bn";
|
||||
sha256 = "02vz386ix28yr2lrn9z0hycqmw1d0npvwvx51fhp2mav66rrx79p";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clair";
|
||||
version = "2.1.4";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quay";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1bvwh3ghxb3ynq8a07ka9i0rzaqg1aikxvqxmpjkwjvhwk63lwqd";
|
||||
sha256 = "10kgg2i5yzdfhylrdkmh8rsc4cgdnhcgfa8fa4dm8m3licjciwam";
|
||||
};
|
||||
|
||||
vendorSha256 = "0x31n50vd8660z816as6kms5dkv87b0mhblccpkvd9cbvcv2n37a";
|
||||
vendorSha256 = "1l3b86f5xmyc6lskvb4ab30adcgzb69ayccc0wcz2f28sda3i80r";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -25,6 +25,7 @@ buildGoModule rec {
|
||||
meta = with lib; {
|
||||
description = "Vulnerability Static Analysis for Containers";
|
||||
homepage = "https://github.com/quay/clair";
|
||||
changelog = "https://github.com/quay/clair/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
};
|
||||
|
||||
44
pkgs/tools/admin/credhub-cli/default.nix
Normal file
44
pkgs/tools/admin/credhub-cli/default.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "credhub-cli";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry-incubator";
|
||||
repo = "credhub-cli";
|
||||
rev = version;
|
||||
sha256 = "1j0i0b79ph2i52cj0qln8wvp6gwhl73akkn026h27vvmlw9sndc2";
|
||||
};
|
||||
|
||||
# these tests require network access that we're not going to give them
|
||||
postPatch = ''
|
||||
rm commands/api_test.go
|
||||
rm commands/socks5_test.go
|
||||
'';
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags="
|
||||
"-s"
|
||||
"-w"
|
||||
"-X code.cloudfoundry.org/credhub-cli/version.Version=${version}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
ln -s $out/bin/credhub-cli $out/bin/credhub
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Provides a command line interface to interact with CredHub servers";
|
||||
homepage = "https://github.com/cloudfoundry-incubator/credhub-cli";
|
||||
maintainers = with maintainers; [ ris ];
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
||||
tar xvzf $src
|
||||
'';
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
sed -i -e 's@-I/usr/include/ncurses@@' \
|
||||
-e 's@/usr/local@'"$out"@ makefile
|
||||
'';
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "you-get";
|
||||
version = "0.4.1488";
|
||||
version = "0.4.1500";
|
||||
|
||||
# Tests aren't packaged, but they all hit the real network so
|
||||
# probably aren't suitable for a build environment anyway.
|
||||
@ -10,7 +10,7 @@ buildPythonApplication rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "28aec2f15e86ea1cbf9900827ade41388aa3f1ac43b4ab49999bce48f37cf9c3";
|
||||
sha256 = "5a6cc0d661fe0cd4210bf467d6c89afd8611609e402690254722c1415736da92";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "z-lua";
|
||||
version = "1.8.7";
|
||||
version = "1.8.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skywind3000";
|
||||
repo = "z.lua";
|
||||
rev = version;
|
||||
sha256 = "14n1abv7gh4zajq471bgzpcv8l1159g00h9x83h719i9kxxsa2ba";
|
||||
sha256 = "0q0qs07kmkpjv68j2bjgsrv6shl76mssnchfv82vjf8abkf8343b";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
33
pkgs/tools/security/teler/default.nix
Normal file
33
pkgs/tools/security/teler/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "teler";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kitabisa";
|
||||
repo = "teler";
|
||||
rev = "v${version}";
|
||||
sha256 = "07pfqgms5cj4y6zm984qjmmw1c8j9yjbgrp2spi9vzk96s3k3qn3";
|
||||
};
|
||||
|
||||
vendorSha256 = "06szi2jw3nayd7pljjlww2gsllgnfg8scnjmc6qv5xl6gf797kdz";
|
||||
|
||||
# test require internet access
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Real-time HTTP Intrusion Detection";
|
||||
longDescription = ''
|
||||
teler is an real-time intrusion detection and threat alert
|
||||
based on web log that runs in a terminal with resources that
|
||||
we collect and provide by the community.
|
||||
'';
|
||||
homepage = "https://github.com/kitabisa/teler";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -1886,6 +1886,10 @@ in
|
||||
|
||||
cppclean = callPackage ../development/tools/cppclean {};
|
||||
|
||||
credhub-cli = callPackage ../tools/admin/credhub-cli {
|
||||
buildGoModule = buildGo114Module;
|
||||
};
|
||||
|
||||
crex = callPackage ../tools/misc/crex { };
|
||||
|
||||
cri-tools = callPackage ../tools/virtualization/cri-tools {};
|
||||
@ -7697,6 +7701,8 @@ in
|
||||
pythonPackages = python3Packages;
|
||||
};
|
||||
|
||||
teler = callPackage ../tools/security/teler { };
|
||||
|
||||
termius = callPackage ../applications/networking/termius { };
|
||||
|
||||
termplay = callPackage ../tools/misc/termplay { };
|
||||
@ -16474,6 +16480,7 @@ in
|
||||
waffle = callPackage ../development/libraries/waffle { };
|
||||
|
||||
wally-cli = callPackage ../development/tools/wally-cli { };
|
||||
zsa-udev-rules = callPackage ../os-specific/linux/zsa-udev-rules { };
|
||||
|
||||
wavpack = callPackage ../development/libraries/wavpack { };
|
||||
|
||||
@ -19915,6 +19922,8 @@ in
|
||||
|
||||
national-park-typeface = callPackage ../data/fonts/national-park { };
|
||||
|
||||
netease-music-tui = callPackage ../applications/audio/netease-music-tui { };
|
||||
|
||||
nordic = callPackage ../data/themes/nordic { };
|
||||
|
||||
nordic-polar = callPackage ../data/themes/nordic-polar { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user