Merge branch 'staging'

2017-03-24 21:07:55 +01:00
parent 9a777013d1 c1a9dc3d37
commit 455ce3528c
49 changed files with 385 additions and 204 deletions
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -47,8 +47,9 @@ in
 assert withPlugin -> builtins.elem hplipArch pluginArches
  || throw "HPLIP plugin not supported on ${stdenv.system}";

-pythonPackages.mkPythonDerivation {
+pythonPackages.buildPythonApplication {
  inherit name src;
+  format = "other";

  buildInputs = [
    libjpeg