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-15 14:41:01 +00:00
parent 0761573507 f402c6321a
commit 5185bc1773
1603 changed files with 132258 additions and 39568 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/gnupg/1.nix
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
description = "free implementation of the OpenPGP standard for encrypting and signing data";
description = "Free implementation of the OpenPGP standard for encrypting and signing data";
homepage = http://www.gnupg.org/;
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
pkgs/tools/security/gnupg/20.nix
+1 -1
View File
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://gnupg.org/";
description = "free implementation of the OpenPGP standard for encrypting and signing data";
description = "Free implementation of the OpenPGP standard for encrypting and signing data";
license = stdenv.lib.licenses.gpl3Plus;
longDescription = ''
pkgs/tools/security/gnupg/21.nix
+6 -4
View File
@@ -13,11 +13,13 @@ with stdenv.lib;
assert x11Support -> pinentry != null;
stdenv.mkDerivation rec {
name = "gnupg-2.1.12";
name = "gnupg-${version}";
version = "2.1.13";
src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
sha256 = "01n5py45x0r97l4dzmd803jpbpbcxr1591k3k4s8m9804jfr4d5c";
sha256 = "0xcn46vcb5x5qx0bc803vpzhzhnn6wfhp7x71w9n1ahx4ak877ag";
};
buildInputs = [
@@ -35,9 +37,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://gnupg.org;
description = "a complete and free implementation of the OpenPGP standard";
description = "A complete and free implementation of the OpenPGP standard";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ wkennington peti fpletz ];
maintainers = with maintainers; [ wkennington peti fpletz vrthra ];
platforms = platforms.all;
};
}
pkgs/tools/security/oath-toolkit/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@ let
else pam;
in
stdenv.mkDerivation rec {
name = "oath-toolkit-2.4.1";
name = "oath-toolkit-2.6.1";
src = fetchurl {
url = "mirror://savannah/oath-toolkit/${name}.tar.gz";
sha256 = "094vbq66sn5f2dsy14hajpsfdnaivjxf70xzs91nrsq0q75l5ylv";
sha256 = "0ybg0gnddmhxga0jwdipyz8jv5mxs0kiiflhvzffl9mw0wcq6mww";
};
pkgs/tools/security/pass/rofi-pass.nix
+4 -3
View File
@@ -1,15 +1,15 @@
{ stdenv, fetchgit
, pass, rofi, coreutils, utillinux, xdotool, gnugrep, pwgen, findutils
, pass, rofi, coreutils, utillinux, xdotool, gnugrep, pwgen, findutils, gawk
, makeWrapper }:
stdenv.mkDerivation rec {
name = "rofi-pass-${version}";
version = "1.3.1";
version = "1.3.2";
src = fetchgit {
url = "https://github.com/carnager/rofi-pass";
rev = "refs/tags/${version}";
sha256 = "1r206fq96avhlgkf2fzf8j2a25dav0s945qv66hwvqwhxq74frrv";
sha256 = "1xqp8s0yyjs2ca9mf8lbz8viwl9xzxf5kk1v68v9hqdgxj26wgls";
};
buildInputs = [ makeWrapper ];
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
rofi
utillinux
xdotool
gawk
];
fixupPhase = ''
pkgs/tools/security/secp256k1/default.nix
+35
View File
@@ -0,0 +1,35 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, ... }:
stdenv.mkDerivation rec {
name = "secp256k1-${version}";
# I can't find any version numbers, so we're just using the date
# of the last commit.
version = "2016-05-30";
src = fetchFromGitHub {
owner = "bitcoin-core";
repo = "secp256k1";
rev = "b3be8521e694eaf45dd29baea035055183c42fe2";
sha256 = "1pgsy72w87yxbiqn96hnm8alsfx3rj7d9jlzdsypyf6i1rf6w4bq";
};
buildInputs = [ autoconf automake libtool ];
configureFlags = [ "--enable-module-recovery" ];
preConfigure = "./autogen.sh";
meta = with stdenv.lib; {
description = "Optimized C library for EC operations on curve secp256k1";
longDescription = ''
Optimized C library for EC operations on curve secp256k1.
Part of Bitcoin Core. This library is a work in progress
and is being used to research best practices. Use at your
own risk.
'';
homepage = https://github.com/bitcoin-core/secp256k1;
license = with licenses; [ mit ];
maintainers = with maintainers; [ chris-martin ];
};
}
pkgs/tools/security/stricat/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "multi-use cryptographic tool based on the STRIBOB algorithm";
description = "Multi-use cryptographic tool based on the STRIBOB algorithm";
homepage = "https://www.stribob.com/stricat/";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
pkgs/tools/security/tor/torbrowser.nix
+3 -3
View File
@@ -12,13 +12,13 @@ in
stdenv.mkDerivation rec {
name = "tor-browser-${version}";
version = "6.0.1";
version = "6.0.2";
src = fetchurl {
url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz";
sha256 = if stdenv.is64bit then
"1n3k0bhjmbmj1rdgyifqya6135wapafqygfviv6x52ng8sa2jhk1" else
"169f90w0fl4pqq9dbhzr6pkk15gqvp7813asqqh1p7s2a32zczza";
"08zik2id1rkcl5cw4yscdgb8rdahx342j1fps576465sziy5z06x" else
"062ddifhdbzj9hjcnvjnqb1is2ydrv9x7hzam4jkpsfvllf4hxcg";
};
desktopItem = makeDesktopItem {
pkgs/tools/security/vault/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "vault-${version}";
version = "0.5.2";
version = "0.5.3";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/vault";
@@ -11,6 +11,6 @@ buildGoPackage rec {
inherit rev;
owner = "hashicorp";
repo = "vault";
sha256 = "085rk5i480wdlkn2p14yxi8zgsc11595nkkda1i77c4vjkllbkdy";
sha256 = "0px9l5zkvqawzsss70g58fx1anrx5zsdgxl6iplv0md111h0d87z";
};
}
pkgs/tools/security/vidalia/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://www.torproject.org/projects/vidalia.html.en;
repositories.git = https://git.torproject.org/vidalia;
description = "a cross-platform graphical controller for the Tor software, built using the Qt framework";
description = "A cross-platform graphical controller for the Tor software, built using the Qt framework";
license = licenses.gpl2Plus;
maintainers = [ maintainers.phreedom ];
platforms = platforms.all;
pkgs/tools/security/volatility/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ buildPythonApplication rec {
meta = with stdenv.lib; {
homepage = https://code.google.com/p/volatility;
description = "advanced memory forensics framework";
description = "Advanced memory forensics framework";
maintainers = with maintainers; [ bosu ];
license = stdenv.lib.licenses.gpl2Plus;
};