Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-02-27 00:08:08 +00:00
parent b4dadff542 766ad682f1
commit 3477e662e6
504 changed files with 28750 additions and 13232 deletions
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, python3Packages}:

-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
  name = "xonsh-${version}";
  version = "0.1.3";