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] 2021-03-08 12:25:40 +00:00 committed by GitHub
commit 6ba8f344c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 196 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/monitoring/alerta.nix
View File

@ -95,13 +95,13 @@ in
ALERTA_SVR_CONF_FILE = alertaConf;
};
serviceConfig = {
ExecStart = "${pkgs.python36Packages.alerta-server}/bin/alertad run --port ${toString cfg.port} --host ${cfg.bind}";
ExecStart = "${pkgs.alerta-server}/bin/alertad run --port ${toString cfg.port} --host ${cfg.bind}";
User = "alerta";
Group = "alerta";
};
};
environment.systemPackages = [ pkgs.python36Packages.alerta ];
environment.systemPackages = [ pkgs.alerta ];
users.users.alerta = {
uid = config.ids.uids.alerta;

4
pkgs/applications/misc/klayout/default.nix
View File

@ -5,13 +5,13 @@
mkDerivation rec {
pname = "klayout";
version = "0.26.9";
version = "0.26.10";
src = fetchFromGitHub {
owner = "KLayout";
repo = "klayout";
rev = "v${version}";
sha256 = "sha256-d0k8OQZ+ij+dslc3iAQkgy1TyYAL7Bf1xvSH21eTGO8=";
sha256 = "sha256-h2jCmLZ2pRlK8VblQosBX0ZcoHDnn4oYeSqzA3y1Tzg=";
};
postPatch = ''

4
pkgs/development/ocaml-modules/ca-certs/default.nix
View File

@ -4,13 +4,13 @@
buildDunePackage rec {
pname = "ca-certs";
version = "0.1.3";
version = "0.2.0";
minimumOCamlVersion = "4.07";
src = fetchurl {
url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz";
sha256 = "0jpghxjp2n8wx6ig0d2x87ycaql6mb92w8ai3xh3jb288m7g02zn";
sha256 = "15jfb5zvahs90jsfs7ridqihlka5198z2xrvplj8ddchxfmpx868";
};
useDune2 = true;

2
pkgs/development/ocaml-modules/optint/default.nix
View File

@ -9,6 +9,8 @@ buildDunePackage rec {
sha256 = "1a7gabxqmfvii8qnxq1clx43md2h9glskxhac8y8r0rhzblx3s1a";
};
useDune2 = true;
meta = {
homepage = "https://github.com/mirage/optint";
description = "Abstract type of integer between x64 and x86 architecture";

33
pkgs/development/python-modules/agate-sql/default.nix
View File

@ -1,15 +1,34 @@
{ lib, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }:
{ lib
, buildPythonPackage
, isPy27
, fetchFromGitHub
, agate
, sqlalchemy
, crate
, nose
, geojson
}:
buildPythonPackage rec {
pname = "agate-sql";
version = "0.5.5";
version = "0.5.6";
src = fetchPypi {
inherit pname version;
sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7";
disabled = isPy27;
src = fetchFromGitHub {
owner = "wireservice";
repo = "agate-sql";
rev = version;
sha256 = "16rijcnvxrvw9mmyk4228dalrr2qb74y649g1l6qifiabx5ij78s";
};
propagatedBuildInputs = [ agate sqlalchemy crate ];
propagatedBuildInputs = [ agate sqlalchemy ];
checkInputs = [ crate nose geojson ];
checkPhase = ''
nosetests
'';
pythonImportsCheck = [ "agatesql" ];
@ -18,7 +37,5 @@ buildPythonPackage rec {
homepage = "https://github.com/wireservice/agate-sql";
license = with licenses; [ mit ];
maintainers = with maintainers; [ vrthra ];
# FAIL: test_to_sql_create_statement_with_schema (tests.test_agatesql.TestSQL)
broken = true;
};
}

29
pkgs/development/python-modules/alerta/default.nix
View File

@ -1,29 +0,0 @@
{ lib, buildPythonPackage, fetchPypi
, six, click, requests, requests-hawk, pytz, tabulate, pythonOlder
}:
buildPythonPackage rec {
pname = "alerta";
version = "8.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "260ff3118e73396104129928217b0f317ac5afdff8221874d8986df22ecf5f34";
};
propagatedBuildInputs = [ six click requests requests-hawk pytz tabulate ];
doCheck = false;
postInstall = ''
wrapProgram $out/bin/alerta --prefix PYTHONPATH : "$PYTHONPATH"
'';
disabled = pythonOlder "3.5";
meta = with lib; {
homepage = "https://alerta.io";
description = "Alerta Monitoring System command-line interface";
license = licenses.asl20;
};
}

26
pkgs/development/python-modules/pure-cdb/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, flake8 }:
buildPythonPackage rec {
pname = "pure-cdb";
version = "3.1.1";
disabled = pythonOlder "3.4";
# Archive on pypi has no tests.
src = fetchFromGitHub {
owner = "bbayles";
repo = "python-pure-cdb";
rev = "v${version}";
hash = "sha256-/FAe4NkY5unt83BOnJ3QqBJFQCPdQnbMVl1fSZ511Fc=";
};
checkInputs = [ flake8 ];
pythonImportsCheck = [ "cdblib" ];
meta = with lib; {
description = "Python library for working with constant databases";
homepage = "https://python-pure-cdb.readthedocs.io/en/latest";
license = licenses.mit;
maintainers = with maintainers; [ kaction ];
};
}

3
pkgs/development/python-modules/pytorch/bin.nix
View File

@ -16,10 +16,9 @@
let
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
platform = if stdenv.isDarwin then "darwin" else "linux";
srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system";
version = "1.7.1";
version = "1.8.0";
in buildPythonPackage {
inherit version;

6
pkgs/development/python-modules/pytorch/binary-hashes.nix
View File

@ -1,14 +1,14 @@
version: {
x86_64-linux-37 = {
url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp37-cp37m-linux_x86_64.whl";
hash = "sha256-XXbCVaQUhMHUGp/1cLnJ82y4XflCiqFaWK4WrHz8LqY=";
hash = "sha256-bs29RJS0vy0xok3fvf8yvZlTibyGYqRUvUDT6M4gKQc=";
};
x86_64-linux-38 = {
url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp38-cp38-linux_x86_64.whl";
hash = "sha256-3S/GiAyV6DaWDYbvu8f2PTKH8uGJPFHTH5bb/gLw1z4=";
hash = "sha256-+h45HMo5N9Xeox8xoagKAb1KgGLAOUSMJUu/WljrB4c=";
};
x86_64-linux-39 = {
url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp39-cp39-linux_x86_64.whl";
hash = "sha256-o3k9zOsSseIoEpDMoSd8XOht39W/BE9lQoWk1pBXrqc=";
hash = "sha256-Ixj6yGCuc9xkhsDeIiNnTZ72E5/HXxV68r+Nzk/KVSQ=";
};
}

4
pkgs/development/python-modules/somajo/default.nix
View File

@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "SoMaJo";
version = "2.1.2";
version = "2.1.3";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "tsproisl";
repo = pname;
rev = "v${version}";
sha256 = "1c4g8nhlcc348w0axdswv69q8k3qxwbnvim1yf7vagd0adv83gsj";
sha256 = "07jkkg5ph5m47xf8w5asy5930qcpy6p11j0admll2y6yjynd2b47";
};
propagatedBuildInputs = [ regex ];

4
pkgs/development/tools/misc/cvise/default.nix
View File

@ -5,13 +5,13 @@
buildPythonApplication rec {
pname = "cvise";
version = "2.1.0";
version = "2.2.0";
src = fetchFromGitHub {
owner = "marxin";
repo = "cvise";
rev = "v${version}";
sha256 = "0ljl0r5jqj6lrddrbxjkcphcz5p4njnn2hqz07jyh30jd9sm7dmj";
sha256 = "116cicz4d506ds3m9bmnb7f9nkp07hyzcrw29ljhznh1i620msim";
};
patches = [

4
pkgs/development/tools/misc/sccache/default.nix
View File

@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1cfdwf00jgwsv0f72427asid1xr57s56jk5xj489dgppvgy7wdbj";
cargoBuildFlags = [ "--features=all" ];
cargoBuildFlags = [ "--features=dist-client,dist-server" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/mozilla/sccache";
maintainers = with maintainers; [ doronbehar ];
license = licenses.asl20;
platforms = platforms.unix;
platforms = [ "x86_64-linux" ];
};
}

27
pkgs/servers/monitoring/alerta/client.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "alerta";
version = "8.4.0";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "260ff3118e73396104129928217b0f317ac5afdff8221874d8986df22ecf5f34";
};
propagatedBuildInputs = with python3.pkgs; [
six click requests requests-hawk pytz tabulate
];
doCheck = false;
disabled = python3.pythonOlder "3.6";
meta = with lib; {
homepage = "https://alerta.io";
description = "Alerta Monitoring System command-line interface";
license = licenses.asl20;
};
}

16
pkgs/development/python-modules/alerta-server/default.nix → pkgs/servers/monitoring/alerta/default.nix
View File

@ -1,17 +1,17 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder
, bcrypt, blinker, flask, flask-compress, flask-cors, mohawk, psycopg2, pyjwt, pymongo, python-dateutil, pytz, pyyaml, requests, requests-hawk, sentry-sdk
{ lib
, python3
}:
buildPythonPackage rec {
python3.pkgs.buildPythonApplication rec {
pname = "alerta-server";
version = "8.3.3";
src = fetchPypi {
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "a2713a31c6e326c774a3ee0328f424f944b951935ff1b893a4a66598d61c5a97";
};
propagatedBuildInputs = [
propagatedBuildInputs = with python3.pkgs; [
bcrypt
blinker
flask
@ -31,11 +31,7 @@ buildPythonPackage rec {
doCheck = false; # We can't run the tests from Nix, because they rely on the presence of a working MongoDB server
postInstall = ''
wrapProgram $out/bin/alertad --prefix PYTHONPATH : "$PYTHONPATH"
'';
disabled = pythonOlder "3.5";
disabled = python3.pythonOlder "3.6";
meta = with lib; {
homepage = "https://alerta.io";

6
pkgs/tools/filesystems/bindfs/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fuse, pkg-config }:
{ lib, stdenv, fetchurl, fuse, pkg-config, osxfuse }:
stdenv.mkDerivation rec {
version = "1.15.1";
@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ fuse ];
buildInputs = if stdenv.isDarwin
then [ osxfuse ]
else [ fuse ];
postFixup = ''
ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs
'';

8
pkgs/tools/misc/lsd/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "lsd";
version = "0.19.0";
version = "0.20.1";
src = fetchFromGitHub {
owner = "Peltoche";
repo = pname;
rev = version;
sha256 = "1iiczdsqw0i6cz492177z6lr8s7fikn151j8p76fmr77zk0bm6q2";
sha256 = "sha256-r/Rllu+tgKqz+vkxA8BSN+3V0lUUd6dEATfickQp4+s=";
};
cargoSha256 = "1r2mkpicsyihlrim3bnmscgg5rnaijpvgq8c846zqj7ly8v8qqvg";
cargoSha256 = "sha256-ZK4kKdW+TqT0NXzB1wtQwJA78cVRxvEoqImOIqLldvM=";
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/Peltoche/lsd";
description = "The next gen ls command";
license = licenses.asl20;
maintainers = with maintainers; [ Br1ght0ne marsam zowoq ];
maintainers = with maintainers; [ Br1ght0ne marsam zowoq SuperSandro2000 ];
};
}

28
pkgs/tools/misc/yubikey-neo-manager/default.nix
View File

@ -1,28 +0,0 @@
{ lib, fetchurl, python27Packages
, libykneomgr, yubikey-personalization, libu2f-host }:
python27Packages.buildPythonPackage rec {
namePrefix = "";
name = "yubikey-neo-manager-${version}";
version = "1.4.0";
src = fetchurl {
url = "https://developers.yubico.com/yubikey-neo-manager/Releases/${name}.tar.gz";
sha256 = "1isxvx27hk0avxwgwcwys2z8ickfs816ii1aklvmi09ak1rgrf1g";
};
propagatedBuildInputs = with python27Packages; [ pyside pycrypto ];
patches = [ ./fix-pyside-requirement.diff ];
# aid ctypes load_libary()
makeWrapperArgs = [
"--set LD_PRELOAD '${libykneomgr}/lib/libykneomgr.so ${yubikey-personalization}/lib/libykpers-1.so ${libu2f-host}/lib/libu2f-host.so'"
];
meta = with lib; {
homepage = "https://developers.yubico.com/yubikey-neo-manager";
description = "Cross platform personalization tool for the YubiKey NEO";
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = with maintainers; [ mbakke ];
};
}

17
pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff
View File

@ -1,17 +0,0 @@
Description: Remove PySide requirement, since python-pyside does not register itself correctly
Author: Dain Nilsson <dain@yubico.com>
Forwarded: no
--- a/setup.py
+++ b/setup.py
@@ -44,8 +44,9 @@
entry_points={
'gui_scripts': ['neoman=neoman.__main__:main']
},
- install_requires=['PySide', 'pycrypto'],
- yc_requires=['ctypes', 'qt'],
+ install_requires=['pycrypto'],
+ yc_requires=['ctypes'],
+ packages=['neoman', 'neoman.model', 'neoman.view', 'neoman.yubicommon', 'neoman.yubicommon.setup', 'neoman.yubicommon.ctypes', 'neoman.yubicommon.qt'],
cmdclass={'executable': executable, 'qt_resources': qt_resources('neoman')},
classifiers=[
'License :: OSI Approved :: BSD License',

31
pkgs/tools/networking/gmvault/default.nix
View File

@ -1,31 +0,0 @@
{ pkgs, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
version = "1.9.1";
pname = "gmvault";
src = fetchurl {
url = "https://bitbucket.org/gaubert/gmvault-official-download/downloads/gmvault-v${version}-src.tar.gz";
name = "${pname}-${version}.tar.bz";
sha256 = "0ffp8df3gdf6lf3pj75hzsmxmvmscppb6bjda58my1n4ppxp1rji";
};
doCheck = false;
propagatedBuildInputs = with pythonPackages; [ gdata IMAPClient Logbook chardet ];
startScript = ./gmvault.py;
patchPhase = ''
cat ${startScript} > etc/scripts/gmvault
chmod +x etc/scripts/gmvault
substituteInPlace setup.py --replace "==" ">="
substituteInPlace setup.py --replace "argparse" ""
'';
meta = {
description = "Backup and restore your gmail account";
homepage = "http://gmvault.org";
license = pkgs.lib.licenses.agpl3Plus;
};
}

4
pkgs/tools/networking/gmvault/gmvault.py
View File

@ -1,4 +0,0 @@
#!/usr/bin/env python
import gmv.gmv_cmd as runner
runner.bootstrap_run()

2
pkgs/tools/security/metasploit/Gemfile
View File

@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.31"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.33"

34
pkgs/tools/security/metasploit/Gemfile.lock
View File

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 56ef940a085620b127d61a516bc10241a795f92b
ref: refs/tags/6.0.31
revision: 76926232b9c92df4832d986513fe89b8c1d53f1f
ref: refs/tags/6.0.33
specs:
metasploit-framework (6.0.31)
metasploit-framework (6.0.33)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@ -31,7 +31,7 @@ GIT
metasploit-concern
metasploit-credential
metasploit-model
metasploit-payloads (= 2.0.28)
metasploit-payloads (= 2.0.34)
metasploit_data_models
metasploit_payloads-mettle (= 1.0.6)
mqtt
@ -123,14 +123,14 @@ GEM
arel (9.0.0)
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.0)
aws-partitions (1.428.0)
aws-sdk-core (3.112.0)
aws-eventstream (1.1.1)
aws-partitions (1.431.1)
aws-sdk-core (3.112.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.225.0)
aws-sdk-ec2 (1.226.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.48.0)
@ -139,11 +139,11 @@ GEM
aws-sdk-kms (1.42.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.88.1)
aws-sdk-s3 (1.89.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.2)
aws-sigv4 (1.2.3)
aws-eventstream (~> 1, >= 1.0.2)
bcrypt (3.1.16)
bcrypt_pbkdf (1.1.0)
@ -186,7 +186,7 @@ GEM
i18n (1.8.9)
concurrent-ruby (~> 1.0)
io-console (0.5.8)
irb (1.3.3)
irb (1.3.4)
reline (>= 0.1.5)
jmespath (1.4.0)
jsobfu (0.4.2)
@ -214,7 +214,7 @@ GEM
activemodel (~> 5.2.2)
activesupport (~> 5.2.2)
railties (~> 5.2.2)
metasploit-payloads (2.0.28)
metasploit-payloads (2.0.34)
metasploit_data_models (4.1.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@ -228,7 +228,7 @@ GEM
metasploit_payloads-mettle (1.0.6)
method_source (1.0.0)
mini_portile2 (2.5.0)
minitest (5.14.3)
minitest (5.14.4)
mqtt (0.5.0)
msgpack (1.4.2)
multipart-post (2.1.1)
@ -239,7 +239,7 @@ GEM
net-ssh (6.1.0)
network_interface (0.0.2)
nexpose (7.2.1)
nio4r (2.5.5)
nio4r (2.5.7)
nokogiri (1.11.1)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
@ -261,7 +261,7 @@ GEM
ttfunk
pg (1.2.3)
public_suffix (4.0.6)
puma (5.2.1)
puma (5.2.2)
nio4r (~> 2.0)
racc (1.5.2)
rack (2.2.3)
@ -285,7 +285,7 @@ GEM
recog (2.3.19)
nokogiri
redcarpet (3.5.1)
reline (0.2.3)
reline (0.2.4)
io-console (~> 0.5)
rex-arch (0.1.14)
rex-text
@ -332,7 +332,7 @@ GEM
rex-socket
rex-text
rex-struct2 (0.1.3)
rex-text (0.2.31)
rex-text (0.2.33)
rex-zip (0.1.4)
rex-text
rexml (3.2.4)

4
pkgs/tools/security/metasploit/default.nix
View File

@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.0.31";
version = "6.0.33";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-wt7VeS8NnmJHMhry/68W1S1f9jUnsSHnhUSrCQN1qNM=";
sha256 = "sha256-hIAXqohZyBJfVj4BxxYVpERZDU6sd6EnVgVax7MXQ7Q=";
};
nativeBuildInputs = [ makeWrapper ];

58
pkgs/tools/security/metasploit/gemset.nix
View File

@ -104,40 +104,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5";
sha256 = "0jfki5ikfr8ln5cdgv4iv1643kax0bjpp29jh78chzy713274jh3";
type = "gem";
};
version = "1.1.0";
version = "1.1.1";
};
aws-partitions = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13rvpllihvpksf1jqwa2i5vbv2hhb34viaidw4rkxr3dyygkdpj8";
sha256 = "08574xgyq39z07xhbgc12882v38lgkmj0jpznpcivjca1v7dk53l";
type = "gem";
};
version = "1.428.0";
version = "1.431.1";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15lynby6r91p9hh5h92pg4jr8xgnjr52px5ax0p0wncdw4vz0skp";
sha256 = "0r5f7pb9dh95f7cb4rdj1z766c88735y6y6msbgzak0v8g8j3dw9";
type = "gem";
};
version = "3.112.0";
version = "3.112.1";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x2f3jp8p7ag9kw7glkiq60ypqq26ra79qnhms4apqz5www86d4d";
sha256 = "0xa39m2lsdq4i0n9r2bz19nv43pjkrs54dnas7q78gl3c467wqj9";
type = "gem";
};
version = "1.225.0";
version = "1.226.0";
};
aws-sdk-iam = {
groups = ["default"];
@ -164,20 +164,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01zlv2icx3m0pq94z9fcsp1r9ivdqhfpnpbrv63fpr6m7yqww24y";
sha256 = "0mznxmpsjqf3gmb6nxkmj2niswy4vvs4ykabf5z9cvamhbvvjhbv";
type = "gem";
};
version = "1.88.1";
version = "1.89.0";
};
aws-sigv4 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5";
sha256 = "1d9zhmi3mpfzkkpg7yw7s9r1dwk157kh9875j3c7gh6cy95lmmaw";
type = "gem";
};
version = "1.2.2";
version = "1.2.3";
};
bcrypt = {
groups = ["default"];
@ -444,10 +444,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00c95xk8c9wzcs5imsrm85jk06y8l4dbnzhvqap98nprr9mxxnvl";
sha256 = "1zf8n7s823rs5byzxpin626hd532ql0w5hdj1i3bds3h8h5gvxwb";
type = "gem";
};
version = "1.3.3";
version = "1.3.4";
};
jmespath = {
groups = ["default"];
@ -524,12 +524,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "56ef940a085620b127d61a516bc10241a795f92b";
sha256 = "1lx8fl1hkas4hpkj3c976pv5ybfm2spzzwhs693n57hd5xwxbpn2";
rev = "76926232b9c92df4832d986513fe89b8c1d53f1f";
sha256 = "1d232yrwfnh5aqks2xxc9q6mji542lbcf09yargi5j2ri2m1g044";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.0.31";
version = "6.0.33";
};
metasploit-model = {
groups = ["default"];
@ -546,10 +546,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xln6zgdiimrbwjbdhi9008bjhmwqm13zky4310pvr7g8riffwqx";
sha256 = "1n0npcd6im6h225pd3abcydsxg9n3hmarmdssy66x4g8wpiifbrp";
type = "gem";
};
version = "2.0.28";
version = "2.0.34";
};
metasploit_data_models = {
groups = ["default"];
@ -596,10 +596,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ipjhdw8ds6q9h7bs3iw28bjrwkwp215hr4l3xf6215fsl80ky5j";
sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
type = "gem";
};
version = "5.14.3";
version = "5.14.4";
};
mqtt = {
groups = ["default"];
@ -696,10 +696,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xbrmq1pvmszrwf40lzwmf8krs2b56720i7wsz9gh274qljkzklf";
sha256 = "00fwz0qq7agd2xkdz02i8li236qvwhma3p0jdn5bdvc21b7ydzd5";
type = "gem";
};
version = "2.5.5";
version = "2.5.7";
};
nokogiri = {
groups = ["default"];
@ -816,10 +816,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10kj484ppkjdg1j8jac4bxdv1082bd6g6xhrj70chlp7lkgl8ggh";
sha256 = "0wiprd0v4mjqv5p1vqaidr9ci2xm08lcxdz1k50mb1b6nrw6r74k";
type = "gem";
};
version = "5.2.1";
version = "5.2.2";
};
racc = {
groups = ["default"];
@ -936,10 +936,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18xpix2hn4x4hihn0fjsv6i7jr7zjfbwzs94hwn48klyq3yrym2h";
sha256 = "15gcafrzp9qzfv65cjapifpqg7cckyr14m9xw86fi56d2b6jms8b";
type = "gem";
};
version = "0.2.3";
version = "0.2.4";
};
rex-arch = {
groups = ["default"];
@ -1106,10 +1106,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "078bdybz7cw3zd0mr59qgr1x6pifnn352636s74i1ncqzrzni46b";
sha256 = "1933p6fri27d2gscws43k1v8jw1821l5j4yfi9z97ch5l80mv1zr";
type = "gem";
};
version = "0.2.31";
version = "0.2.33";
};
rex-zip = {
groups = ["default"];

27
pkgs/tools/security/passphrase2pgp/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib, pandoc, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "passphrase2pgp";
version = "1.1.0";
src = fetchFromGitHub {
owner = "skeeto";
repo = pname;
rev = "v${version}";
hash = "sha256-Nje77tn55CKRU6igEA/6IquDhXVVQAdiez6nmN49di4";
};
vendorSha256 = "sha256-7q5nwkj4TP7VgHmV9YBbCB11yTPL7tK4gD+uN4Vw3Cs";
postInstall = ''
mkdir -p $out/share/doc/$name
cp README.md $out/share/doc/$name
'';
meta = with lib; {
description = "Predictable, passphrase-based PGP key generator";
homepage = "https://github.com/skeeto/passphrase2pgp";
license = licenses.unlicense;
maintainers = with maintainers; [ kaction ];
};
}

2
pkgs/tools/text/csvkit/default.nix
View File

@ -38,7 +38,5 @@ python3.pkgs.buildPythonApplication rec {
maintainers = with maintainers; [ vrthra ];
license = licenses.mit;
homepage = "https://github.com/wireservice/csvkit";
# FAIL: test_to_sql_create_statement_with_schema (tests.test_agatesql.TestSQL)
broken = true;
};
}

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

@ -232,6 +232,7 @@ mapAliases ({
};
glib_networking = glib-networking; # added 2018-02-25
gmailieer = lieer; # added 2020-04-19
gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # added 2021-03-08
gnome-mpv = celluloid; # added 2019-08-22
gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2019-12-10
gmic_krita_qt = gmic-qt-krita; # added 2019-09-07
@ -786,6 +787,7 @@ mapAliases ({
xv = xxv; # added 2020-02-22
youtubeDL = youtube-dl; # added 2014-10-26
ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";
yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # added 2021-03-08
yuzu = yuzu-mainline; # added 2021-01-25
zdfmediathk = mediathekview; # added 2019-01-19
gnome_user_docs = gnome-user-docs; # added 2019-11-20

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

@ -1400,6 +1400,8 @@ in
pass = callPackage ../tools/security/pass { };
passphrase2pgp = callPackage ../tools/security/passphrase2pgp { };
pass-git-helper = python3Packages.callPackage ../applications/version-management/git-and-tools/pass-git-helper { };
pass-nodmenu = callPackage ../tools/security/pass {
@ -4770,8 +4772,6 @@ in
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav;
};
gmvault = callPackage ../tools/networking/gmvault { };
gnash = callPackage ../misc/gnash {
autoreconfHook = buildPackages.autoreconfHook269;
};
@ -17559,8 +17559,6 @@ in
pythonPackages = python3Packages;
};
yubikey-neo-manager = callPackage ../tools/misc/yubikey-neo-manager { };
yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { };
yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { };
@ -17832,6 +17830,10 @@ in
adguardhome = callPackage ../servers/adguardhome {};
alerta = callPackage ../servers/monitoring/alerta/client.nix { };
alerta-server = callPackage ../servers/monitoring/alerta { };
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
apacheHttpd = pkgs.apacheHttpd_2_4;

6
pkgs/top-level/python-packages.nix
View File

@ -334,10 +334,6 @@ in {
alembic = callPackage ../development/python-modules/alembic { };
alerta = callPackage ../development/python-modules/alerta { };
alerta-server = callPackage ../development/python-modules/alerta-server { };
algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { };
allpairspy = callPackage ../development/python-modules/allpairspy { };
@ -5259,6 +5255,8 @@ in {
pulsectl = callPackage ../development/python-modules/pulsectl { };
pure-cdb = callPackage ../development/python-modules/pure-cdb { };
pure-eval = callPackage ../development/python-modules/pure-eval { };
pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { };