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

Merge pull request #116335 from SuperSandro2000/move-aliases.nix

Browse Source
This commit is contained in:
Sandro
2021-04-05 04:07:15 +02:00
committed by GitHub
parent 7ffdeb358b f9bcee4ed5
commit 7c932296e0
237 changed files with 1074 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/enpass/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, glib, libGLU, libGL, libpulseaudio, zlib, dbus, fontconfig, freetype
, gtk3, pango
, makeWrapper , python2Packages, lib
, lsof, curl, libuuid, cups, mesa, lzma, libxkbcommon
, lsof, curl, libuuid, cups, mesa, xz, libxkbcommon
}:
let
@@ -38,7 +38,7 @@ let
curl
libuuid
cups
lzma
xz
libxkbcommon
]);
package = stdenv.mkDerivation {
pkgs/tools/security/john/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2
{ lib, stdenv, fetchurl, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2
, gcc, python3Packages, perl, perlPackages, makeWrapper
}:
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
"--with-systemwide"
];
buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 ];
buildInputs = [ openssl nss nspr libkrb5 gmp zlib libpcap re2 ];
nativeBuildInputs = [ gcc python3Packages.wrapPython perl makeWrapper ];
propagatedBuildInputs = (with python3Packages; [ dpkt scapy lxml ]) ++ # For pcap2john.py
(with perlPackages; [ DigestMD4 DigestSHA1 GetoptLong # For pass_gen.pl
pkgs/tools/security/sshguard/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoreconfHook, yacc, flex}:
{ lib, stdenv, fetchurl, autoreconfHook, bison, flex}:
stdenv.mkDerivation rec {
version = "2.4.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
doCheck = true;
nativeBuildInputs = [ autoreconfHook yacc flex ];
nativeBuildInputs = [ autoreconfHook bison flex ];
configureFlags = [ "--sysconfdir=/etc" ];
pkgs/tools/security/tor/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, libevent, openssl, zlib, torsocks
, libseccomp, systemd, libcap, lzma, zstd, scrypt, nixosTests
, libseccomp, systemd, libcap, xz, zstd, scrypt, nixosTests
, writeShellScript
# for update.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "geoip" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libevent openssl zlib lzma zstd scrypt ] ++
buildInputs = [ libevent openssl zlib xz zstd scrypt ] ++
lib.optionals stdenv.isLinux [ libseccomp systemd libcap ];
patches = [ ./disable-monotonic-timer-tests.patch ];