Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-11-03 12:06:41 +01:00
317 changed files with 3210 additions and 2827 deletions
+2 -2
View File
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "aws-okta";
version = "1.0.5";
version = "1.0.6";
goPackagePath = "github.com/segmentio/aws-okta";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "segmentio";
repo = "aws-okta";
rev = "v${version}";
sha256 = "1xd73j6rbbdrnzj0m8dqwcvn62cz6bygdpxsx8g7117qbdzz2lj1";
sha256 = "1nhcqj3vhdgk0a0smmyqphjw2slcvqbb8xd8bx506j8h8x84p6yf";
};
buildFlags = [ "--tags" "release" ];
+2 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "clevis";
version = "14";
version = "15";
src = fetchFromGitHub {
owner = "latchset";
repo = pname;
rev = "v${version}";
sha256 = "1j8id67jk3ikim2xh7vjg7j2ayrpm1a4n8v3n8r8pnr4rhqy76fd";
sha256 = "0wfgd2v1r47ckh5qp60b903191fx0fa27zyadxlsb8riqszhmwvz";
};
nativeBuildInputs = [ meson ninja pkgconfig asciidoc ];
+5 -4
View File
@@ -1,13 +1,14 @@
{ stdenv, fetchgit, pkgconfig, autoconf, automake, openssl, libgsf, gmp }:
{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, openssl, libgsf, gmp }:
stdenv.mkDerivation rec {
pname = "crackxls";
version = "0.4";
src = fetchgit {
url = "https://github.com/GavinSmith0123/crackxls2003.git";
rev = "refs/tags/v${version}";
src = fetchFromGitHub {
owner = "GavinSmith0123";
repo = "crackxls2003";
rev = "v${version}";
sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz";
};
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "doppler";
version = "3.15.0";
version = "3.16.0";
src = fetchFromGitHub {
owner = "dopplerhq";
repo = "cli";
rev = version;
sha256 = "06icddb99ahmi5djrslpqsjjd38agvkhnfls5wqahclf0j4dylr6";
sha256 = "1hypi62bzdpa55bd9z9lvisw7ybcn8jlk0kyck9h7wc2ll59jzwx";
};
vendorSha256 = "0wqbwk72k4r30a3vnf0gnx3k97y8xgnr2iavk5bc8f8vkjv0bsv6";
vendorSha256 = "1s8zwjfk9kcddn8cywr7llh9v5m140kvmi5lmy2glvwh3rwccgxf";
buildFlagsArray = "-ldflags=-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}";
+7 -8
View File
@@ -1,5 +1,5 @@
{ stdenv
, fetchFromGitHub
, fetchgit
, rustPlatform
, CoreFoundation
, libiconv
@@ -7,22 +7,21 @@
}:
rustPlatform.buildRustPackage rec {
pname = "genpass";
version = "0.4.1";
version = "0.4.9";
src = fetchFromGitHub {
owner = "cyplo";
repo = pname;
src = fetchgit {
url = "https://git.sr.ht/~cyplo/genpass";
rev = "v${version}";
sha256 = "1b22m7g55k5ry0vwyd8pakh8rmfkhk37qy5r74cn3n5pv3fcwini";
sha256 = "1dpv2iyd48xd8yw9bmymjjrkhsgmpwvsl5b9zx3lpaaq59ypi9g9";
};
cargoSha256 = "1p6l64s9smhwka8bh3pamqimamxziad859i62nrmxzqc49nq5s7m";
cargoSha256 = "1cwxpc3xkw673wiamr4v7clrzwxl8ma1vdr6bw0hixm37gxdxz7x";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];
meta = with stdenv.lib; {
description = "A simple yet robust commandline random password generator";
homepage = "https://github.com/cyplo/genpass";
homepage = "https://sr.ht/~cyplo/genpass/";
license = licenses.agpl3;
maintainers = with maintainers; [ cyplo ];
};
+2 -2
View File
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "gnu-pw-mgr";
version = "2.4.2";
version = "2.7.4";
src = fetchurl {
url = "https://ftp.gnu.org/gnu/gnu-pw-mgr/${pname}-${version}.tar.xz";
sha256 = "1yvdzc5w37qrjrkby5699ygj9bhkvgi3zk9k9jcjry1j6b7wdl17";
sha256 = "0fhwvsmsqpw0vnivarfg63l8pgwqfv7d5wi6l80jpb41dj6qpjz8";
};
buildInputs = [ gnulib ];
+1 -1
View File
@@ -10,7 +10,7 @@ let
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "${version}";
rev = version;
sha256 = "0dcl5a5jykgfmnfj42vl7kah9k26wg38l2g6yfh5pssmlf0nax33";
};
+2 -2
View File
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, perl, perlPackages }:
stdenv.mkDerivation rec {
version = "3.4";
version = "3.6";
pname = "kpcli";
src = fetchurl {
url = "mirror://sourceforge/kpcli/${pname}-${version}.pl";
sha256 = "0s46cni16ph93havmkrlai3k13mdppyca1s2bqm751a6rirmsgj0";
sha256 = "1srd6vrqgjlf906zdyxp4bg6gihkxn62cpzyfv0zzpsqsj13iwh1";
};
buildInputs = [ makeWrapper perl ];
+1 -1
View File
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
src = fetchCrate {
inherit version;
crateName = "${pname}";
crateName = pname;
sha256 = "0p37kwkp153mkns4bh7k7gnksk6c31214wlw3faf42daav32mmgw";
};
+1 -1
View File
@@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "RustScan";
repo = pname;
rev = "${version}";
rev = version;
sha256 = "0dhy7b73ipsxsr7wlc3r5yy39i3cjrdszhsw9xwjj31692s3b605";
};
+2 -22
View File
@@ -2,39 +2,19 @@
python3Packages.buildPythonApplication rec {
pname = "ssh-audit";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "jtesta";
repo = pname;
rev = "v${version}";
sha256 = "1k5nv2cdnzd3j2p729vjw6ya0gwwkxhqijs2b7p68wvp0n3y3m77";
sha256 = "1h739r5nv5zkmjyyjwkw8r6d4avddjjxsamc5rffwfxi1kjavpxm";
};
postPatch = ''
cp ./README.md packages/sshaudit/
cp ./ssh-audit.py packages/sshaudit/sshaudit.py
mv packages/* .
ls -lah
'';
checkInputs = with python3Packages; [
pytestCheckHook
];
disabledTests = [
"test_resolve_error"
"test_resolve_hostname_without_records"
"test_resolve_ipv4"
"test_resolve_ipv6"
"test_resolve_ipv46_both"
"test_resolve_ipv46_order"
"test_invalid_host"
"test_invalid_port"
"test_not_connected_socket"
"test_ssh2_server_simple"
];
meta = with lib; {
description = "Tool for ssh server auditing";
homepage = "https://github.com/jtesta/ssh-audit";
+5 -3
View File
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, buildGoPackage, installShellFiles }:
{ stdenv, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }:
buildGoPackage rec {
pname = "vault";
version = "1.5.4";
version = "1.5.5";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
sha256 = "0bin0r0qmyz8xal910csbclzc6ng2xv69jszyi69gd6n6f43vqw8";
sha256 = "144v7vmp2amv29y6d50jzc21zrcw0g6qlwks16mvqy2hnbsnzdwa";
};
goPackagePath = "github.com/hashicorp/vault";
@@ -24,6 +24,8 @@ buildGoPackage rec {
installShellCompletion vault.bash
'';
passthru.tests.vault = nixosTests.vault;
meta = with stdenv.lib; {
homepage = "https://www.vaultproject.io/";
description = "A tool for managing secrets";
+9 -7
View File
@@ -1,30 +1,30 @@
{ stdenv, fetchurl, unzip }:
{ stdenv, fetchurl, unzip, nixosTests }:
let
version = "1.5.4";
version = "1.5.5";
sources = let
base = "https://releases.hashicorp.com/vault/${version}";
in {
x86_64-linux = fetchurl {
url = "${base}/vault_${version}_linux_amd64.zip";
sha256 = "1cyk9v70w0px2sxg8dichqgk38br9hc4kdl37jk57ci5gdl6w5ah";
sha256 = "1vg1c34d2ck2a96p800gblq06jakg29yzrczaa6nsmnnr3k5hs9a";
};
i686-linux = fetchurl {
url = "${base}/vault_${version}_linux_386.zip";
sha256 = "1n6hmhd4g2c6zzbimslxpghma5dyqwb96w60srbf9gn2vrimg4l4";
sha256 = "1hf46mm7shvq9gpi50b6hcp2cydhzbkwigqcnl527y4cvc9iv7in";
};
x86_64-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_amd64.zip";
sha256 = "05d5m8kdwl6mcx3swkasm5zcmddlyl6m9lwj26vbg9pllx9zxvqm";
sha256 = "1jna9rmdhqi7j8p67y9dzq716dv8fn4rjsn76mbvlgc5wylky6gz";
};
i686-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_386.zip";
sha256 = "109hisdwd58za541qhw61bscfrh3szzfn8vdmr4c7nh5praiqznb";
sha256 = "1qv02zd5dwaw1i52pnbyshbd8cy0x5nr3f2s9l3p9ci5rzad4rjn";
};
aarch64-linux = fetchurl {
url = "${base}/vault_${version}_linux_arm64.zip";
sha256 = "0q8icl5ncvixrdmsd2ilzvpa6c1pswa6zgh3vccsj7sg8mxprjmr";
sha256 = "1y4i62qq5cx2bv18dnbgys2qa5xx0acn8j3hdh0dbsw0zyms4qv7";
};
};
@@ -44,6 +44,8 @@ in stdenv.mkDerivation {
echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
'';
passthru.tests.vault = nixosTests.vault;
meta = with stdenv.lib; {
homepage = "https://www.vaultproject.io";
description = "A tool for managing secrets, this binary includes the UI";