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

Merge master into staging

Browse Source
This commit is contained in:
Orivej Desh
2019-07-25 09:23:01 +00:00
parent aabb651b23 b5d1d50aa9
commit 32fbbc6f9b
193 changed files with 4440 additions and 1950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/security/ghidra/default.nix
View File

@@ -6,11 +6,11 @@
in stdenv.mkDerivation {
name = "ghidra-9.0";
name = "ghidra-9.0.2";
src = fetchurl {
url = https://ghidra-sre.org/ghidra_9.0_PUBLIC_20190228.zip;
sha256 = "3b65d29024b9decdbb1148b12fe87bcb7f3a6a56ff38475f5dc9dd1cfc7fd6b2";
url = https://ghidra-sre.org/ghidra_9.0.2_PUBLIC_20190403.zip;
sha256 = "10ffd65c266e9f5b631c8ed96786c41ef30e2de939c3c42770573bb3548f8e9f";
};
nativeBuildInputs = [

22
pkgs/tools/security/pinentry/default.nix
View File

@@ -1,9 +1,21 @@
{ fetchurl, fetchpatch, stdenv, lib, pkgconfig
, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null
, libgpgerror, libassuan
, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null
, qt4 ? null, qt5 ? null
, enableEmacs ? false
}:
stdenv.mkDerivation rec {
assert qt5 != null -> qt4 == null;
assert qt4 != null -> qt5 == null;
let
mkDerivation =
if qt5 != null
then qt5.mkDerivation
else stdenv.mkDerivation;
in
mkDerivation rec {
name = "pinentry-1.1.0";
src = fetchurl {
@@ -12,7 +24,9 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt ];
buildInputs =
[ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt4 ]
++ stdenv.lib.optional (qt5 != null) qt5.qtbase;
prePatch = ''
substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses
@@ -34,7 +48,7 @@ stdenv.mkDerivation rec {
(stdenv.lib.enableFeature enableEmacs "pinentry-emacs")
(stdenv.lib.enableFeature (gtk2 != null) "pinentry-gtk2")
(stdenv.lib.enableFeature (gcr != null) "pinentry-gnome3")
(stdenv.lib.enableFeature (qt != null) "pinentry-qt")
(stdenv.lib.enableFeature (qt4 != null || qt5 != null) "pinentry-qt")
"--with-libassuan-prefix=${libassuan.dev}"
"--with-libgpg-error-prefix=${libgpgerror.dev}"