Merge remote-tracking branch 'upstream/master' into HEAD

2016-10-22 17:23:24 +02:00
parent bd12c10993 8c465c5201
commit e56832d730
221 changed files with 10778 additions and 4428 deletions
@@ -1,14 +1,13 @@
 { stdenv, fetchhg, pkgs, pythonPackages }:

 pythonPackages.buildPythonApplication rec {
-  version = "2016-04-10-b5721f1c6f01bd168a5781652e5e3167f7f8ceb3";
+  version = "2.0b12";
  name = "beancount-${version}";
  namePrefix = "";

-  src = fetchhg {
-    url = "https://bitbucket.org/blais/beancount";
-    rev = "b5721f1c6f01bd168a5781652e5e3167f7f8ceb3";
-    sha256 = "10nv3p9cix7yp23a9hnq5163rpl8cfs3hv75h90ld57dc24nxzn2";
+  src = pkgs.fetchurl {
+    url = "mirror://pypi/b/beancount/${name}.tar.gz";
+    sha256 = "0n0wyi2yhmf8l46l5z68psk4rrzqkgqaqn93l0wnxsmp1nmqly9z";
  };

  buildInputs = with pythonPackages; [ nose ];