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

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-07-31 20:51:34 +00:00
parent 43ba8d295f a629cd3f02
commit 63c7b4f9a7
701 changed files with 12952 additions and 15151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/clamav/default.nix
+3 -3
View File
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "clamav-${version}";
version = "0.99.1";
version = "0.99.2";
src = fetchurl {
url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz";
sha256 = "12nm4mxzx3qlbm65cadflzncjfkxdfqcp0lch29i5yfk4a8nhi71";
url = "https://www.clamav.net/downloads/production/${name}.tar.gz";
sha256 = "0yh2q318bnmf2152g2h1yvzgqbswn0wvbzb8p4kf7v057shxcyqn";
};
buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ];
pkgs/tools/security/gnupg/21.nix
+2 -2
View File
@@ -15,11 +15,11 @@ assert x11Support -> pinentry != null;
stdenv.mkDerivation rec {
name = "gnupg-${version}";
version = "2.1.13";
version = "2.1.14";
src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
sha256 = "0xcn46vcb5x5qx0bc803vpzhzhnn6wfhp7x71w9n1ahx4ak877ag";
sha256 = "0hmsiscpdpdqd8kcjpzkz2gzcc3cnrvswk9p1jzi4sivd7lxwl4l";
};
buildInputs = [
pkgs/tools/security/simple-tpm-pk11/default.nix
+3 -3
View File
@@ -1,12 +1,12 @@
{ stdenv, fetchgit, trousers, openssl, opencryptoki, automake, autoconf, libtool }:
stdenv.mkDerivation rec {
name = "simple-tpm-pk11-2014-09-25";
name = "simple-tpm-pk11-2016-07-12";
src = fetchgit {
url = "https://github.com/ThomasHabets/simple-tpm-pk11";
rev = "f26f10e11344560ff6e1479e6795dc0e5dc49a26";
sha256 = "0546lhxssngpkrhg5kmrvn4bm1s2kyd20kvhz3rfavfrvr72cs9k";
rev = "6f1f7a6b96ac82965e977cfecb88d930f1d70243";
sha256 = "06vf3djp29slh7hrh4hlh3npyl277fy7d77jv9mxa1sk1idjklxc";
};
buildInputs = [ trousers openssl opencryptoki automake autoconf libtool ];
pkgs/tools/security/vault/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "vault-${version}";
version = "0.5.3";
version = "0.6.0";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/vault";
@@ -11,6 +11,6 @@ buildGoPackage rec {
inherit rev;
owner = "hashicorp";
repo = "vault";
sha256 = "0px9l5zkvqawzsss70g58fx1anrx5zsdgxl6iplv0md111h0d87z";
sha256 = "0byb91nqrhl7w0rq0ilml1ybamh8w1qga47a790kggsmjhcj9ybx";
};
}