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

Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix

1 files changed, 25 insertions, 0 deletions

diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix
new file mode 100644
index 000000000000..02931215b8d3
--- /dev/null
+++ b/pkgs/development/python-modules/xstatic/default.nix
@@ -0,0 +1,25 @@
+{ buildPythonPackage
+, lib
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "XStatic";
+  version = "1.0.1";
+
+  src = fetchPypi {
+    inherit version pname;
+    sha256 = "09npcsyf1ccygjs0qc8kdsv4qqy8gm1m6iv63g9y1fgbcry3vj8f";
+  };
+
+  # no tests implemented
+  doCheck = false;
+
+  meta = with lib;{
+    homepage = https://bitbucket.org/thomaswaldmann/xstatic;
+    description = "Base packaged static files for python";
+    license = licenses.mit;
+    maintainers = with maintainers; [ makefu ];
+  };
+
+}