Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates ... Conflicts (simple): pkgs/applications/networking/browsers/chromium/default.nix pkgs/development/libraries/libsoup/default.nix pkgs/os-specific/linux/kernel/manual-config.nix pkgs/os-specific/linux/qemu-kvm/default.nix		2013-03-02 10:41:53 +01:00
..
aespipe	aespipe: Fix typo in maintainer id	2013-02-21 22:30:14 +01:00
apg	tools/security/apg: New nixpkg.	2013-02-17 17:44:54 +04:00
bmrsa
ccid	opensc stuff: fix some packages by updating	2013-02-23 14:00:49 +01:00
ccrypt	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
chkrootkit
clamav	ClamAV: package.	2012-07-23 17:22:51 +03:00
dirmngr
ecryptfs
fail2ban
fprot	F-Prot: package	2012-07-24 10:48:22 +03:00
gnupg	gpg/pth: fixing the pth building on arm	2012-11-15 12:38:18 +01:00
gnupg1	gnupg: Update to 1.4.13	2013-01-07 00:33:05 +01:00
gnupg1compat
ksshaskpass
metasploit
mkpasswd	Add mkpasswd, an overfeatured front end to crypt	2013-02-27 12:14:09 +01:00
mktemp
muscleframework
muscletool
nmap
opensc
opensc-dnie-wrapper
ossec	Add initial attempt at ossec	2012-07-09 11:44:44 -04:00
pcsclite	opensc stuff: fix some packages by updating	2013-02-23 14:00:49 +01:00
pinentry	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
pius
polkit-gnome	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
polkit-kde-agent	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
pwgen
rng-tools	rng-tools: add meta.platforms	2013-02-09 15:09:46 -05:00
seccure
ssss
sudo
super
tor	torsocks: version bump to 1.2	2013-01-15 08:13:56 +02:00
vidalia	Vidalia: version bump to 0.2.21	2013-01-13 15:28:38 +02:00