Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát
2016-09-28 17:13:59 +02:00
306 changed files with 5064 additions and 6180 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pythonPackages, buildPythonApplication, hping }:
{ stdenv, fetchFromGitHub, pythonPackages, hping }:
pythonPackages.buildPythonApplication rec {
rev = "bf14bbff";