Vladimír Čunát 87c3c0e885 Merge master into #2129 ... Conflicts (easy, just UID shifted): nixos/modules/misc/ids.nix nixos/modules/module-list.nix		2014-08-12 19:24:08 +02:00
..
aespipe	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
apg
bmrsa
ccid	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
ccrypt	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
chkrootkit
clamav
dirmngr
duo-unix	duo-unix: upgrade, fix full name + version	2014-06-17 17:06:31 -05:00
ecryptfs
fail2ban	fail2ban: systemd support	2014-08-08 00:10:19 +02:00
fprot	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
gnupg	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
gnupg1	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
gnupg1compat
hashcat
haveged
jd-gui	jd-gui: version 0.3.5	2014-06-17 14:44:49 -05:00
ksshaskpass
meo	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
metasploit
mkpasswd
mktemp
munge
muscleframework	muscleframework/tool remove platform as lib is marked broken	2014-08-12 13:02:11 +02:00
muscletool	muscleframework/tool remove platform as lib is marked broken	2014-08-12 13:02:11 +02:00
nmap
oath-toolkit
opensc
opensc-dnie-wrapper
ossec
p0f
paperkey	added paperkey package	2014-08-04 13:11:29 +02:00
pass	pass: update from 1.6.2 to 1.6.3	2014-08-04 15:54:05 +02:00
pcsclite
pinentry	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
pius	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
polkit-gnome
polkit-kde-agent
prey
pwgen
rng-tools
scrypt
seccure
ssdeep
sshuttle
ssss
steghide
sudo	keep fallback visudo editor as nano	2014-06-22 19:50:40 +02:00
super
tboot
tcpcrypt
tor	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
torbutton
tpm-quote-tools
tpm-tools
trousers
vidalia
volatility	volatility: fix indentation	2014-07-11 17:10:26 +02:00