Merge remote-tracking branch 'origin/staging/jeschli'

5 files changed, 14 insertions, 14 deletions

diff --git a/makefu/5pkgs/ampel/default.nix b/makefu/5pkgs/ampel/default.nix
index 86518b9b8..9792c2c59 100644
--- a/makefu/5pkgs/ampel/default.nix
+++ b/makefu/5pkgs/ampel/default.nix
@@ -2,7 +2,7 @@
 
 with pkgs.python3Packages;buildPythonPackage rec {
   name = "ampel-${version}";
-  version = "0.2";
+  version = "0.2.1";
 
   propagatedBuildInputs = [
     docopt
@@ -16,8 +16,8 @@ with pkgs.python3Packages;buildPythonPackage rec {
 
   src = pkgs.fetchgit {
       url = "http://cgit.euer.krebsco.de/ampel";
-      rev = "d8a0250";
-      sha256 = "0n36lc17ca5db6pl6dswdqd5w9f881rfqck9yc4w33a5qpsxj85f";
+      rev = "92321d7";
+      sha256 = "0mvpbpf1rx8sc589qjb73gl8z6fir2zs3gl3br1pbhg5jgn0ij4n";
   };
   meta = {
     homepage = http://cgit.euer.krebsco.de/ampel;
diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index e748981c6..e49a88697 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -412,8 +412,7 @@ clientkeys = awful.util.table.join(
         end),
     awful.key({ modkey,           }, "m",
         function (c)
-            c.maximized_horizontal = not c.maximized_horizontal
-            c.maximized_vertical   = not c.maximized_vertical
+            c.maximized = not c.maximized
         end)
 )
 
diff --git a/makefu/5pkgs/devpi/default.nix b/makefu/5pkgs/devpi/default.nix
index 3ddcd9641..6515ea3d1 100644
--- a/makefu/5pkgs/devpi/default.nix
+++ b/makefu/5pkgs/devpi/default.nix
@@ -16,16 +16,17 @@ let
   };
   devpi-web = pkgs.python3Packages.buildPythonPackage rec {
     name = "devpi-web";
-    version = "3.1.1";
+    version = "3.2.2";
 
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/d/devpi-web/devpi-web-${version}.tar.gz";
-      sha256 = "0bvqv52jmasfm4sdyccwsgvk9a663d3grj7zjw8r9x7xm7l3svqv";
+      sha256 = "1mwg2fcw88rn47ypnhg5f4s1r066129z922113shyinwrwfddhay";
     };
 
-    propagatedBuildInputs = with pkgs.python3Packages;
-      [ pkgs.devpi-server pyramid_chameleon beautifulsoup4 defusedxml readme-renderer ];
+    propagatedBuildInputs = with pkgs.python3Packages; builtins.trace pkgs.devpi-server.version
+      [ pkgs.devpi-server pyramid_chameleon pygments docutils devpi-common
+      whoosh beautifulsoup4 defusedxml readme-renderer ];
 
     meta = {
       homepage = https://bitbucket.org/hpk42/devpi;
@@ -37,6 +38,6 @@ let
 
 in {
   devpi-web =  pkgs.python3.buildEnv.override {
-      extraLibs = [ devpi-web devpi-server ];
-    };
+      extraLibs = [ devpi-web pkgs.devpi-server ];
+  };
 }
diff --git a/makefu/5pkgs/elchhub/default.nix b/makefu/5pkgs/elchhub/default.nix
index 76ba834ab..df5777135 100644
--- a/makefu/5pkgs/elchhub/default.nix
+++ b/makefu/5pkgs/elchhub/default.nix
@@ -22,13 +22,13 @@ in buildPythonPackage rec {
   ];
   doCheck = false;
   src = fetchFromGitHub {
-    owner = "krebscode";
+    owner = "krebs";
     repo = "elchhub";
     rev = "58707c6";
     sha256 = "04spbcr660dxyc4jvrai094na25zizd2cfi36jz19lahb0k66lqm";
   };
   meta = {
-    homepage = https://github.com/krebscode/elchhub;
+    homepage = https://github.com/krebs/elchhub;
     description = "elchhub";
     license = lib.licenses.wtfpl;
   };
diff --git a/makefu/5pkgs/python-firetv/default.nix b/makefu/5pkgs/python-firetv/default.nix
index 1fb772f1f..593f4e718 100644
--- a/makefu/5pkgs/python-firetv/default.nix
+++ b/makefu/5pkgs/python-firetv/default.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, python2Packages, ... }:
 # requires libusb1 from unstable
-with (import <nixpkgs-unstable> {}).python2Packages; let
+with python2Packages; let
 
  python-adb = buildPythonPackage rec {
     pname = "adb";