diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-29 10:51:54 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-29 10:51:54 +0200 |
commit | 2858c41823db1654f123c455cca2b145b8d8737b (patch) | |
tree | 48518e1eb8916d1528d75823c2d1232822d059e9 /pkgs/development/python-modules/marionette-harness | |
parent | 34b6bbe021baa11a4dddf9532b331dac8d4162f2 (diff) | |
parent | e1f755e44faa5745ad3a8b18e18017e77dfbe67c (diff) |
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
Diffstat (limited to 'pkgs/development/python-modules/marionette-harness')
-rw-r--r-- | pkgs/development/python-modules/marionette-harness/mozinfo.nix | 14 | ||||
-rw-r--r-- | pkgs/development/python-modules/marionette-harness/mozlog.nix | 5 |
2 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix index d22e92876bf25..0e24ab09de67f 100644 --- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix +++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix @@ -1,7 +1,7 @@ -{ lib -, stdenv +{ stdenv , buildPythonPackage , fetchPypi +, isPy3k , mozfile }: @@ -15,12 +15,14 @@ buildPythonPackage rec { sha256 = "1jwhnhbj7xipwh33wf7m12pw5g662dpr1chkp6p2fmy0mwpn2y4z"; }; - propagatedBuildInputs = [ mozfile ]; + disabled = isPy3k; - meta = { + propagatedBuildInputs = [ mozfile ]; + + meta = with stdenv.lib; { description = "System information utilities for Mozilla testing"; homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; - license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ raskin ]; + license = licenses.mpl20; + maintainers = with maintainers; [ raskin ]; }; } diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix index 7382425f240db..5960848ff63b6 100644 --- a/pkgs/development/python-modules/marionette-harness/mozlog.nix +++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, isPy3k , blessings , mozfile }: @@ -11,12 +12,14 @@ buildPythonPackage rec { version = "3.4"; name = "${pname}-${version}"; + disabled = isPy3k; + src = fetchPypi { inherit pname version; sha256 = "1m4d9i1kzcmkhipfd5czv05f2s84j1byx3cv4y2irjmwq5v6cyiq"; }; - propagatedBuildInputs = [ blessings mozfile ]; + propagatedBuildInputs = [ blessings mozfile ]; meta = { description = "Mozilla logging library"; |