From 9215e03e17e1cbf7a3a6ddfbd446adf6001e0713 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Mar 2018 00:55:00 +0200 Subject: [PATCH] pythonPackages.mrbob: fix build Tests broke on Hydra as the `checkPhase` wasn't configured properly. By explicitly relying on `nosetests` and injecting `LC_ALL` into the `checkPhase` the tests work again. The license (bsd3) according to `LICENSE` distributed with the upstream package wasn't specified in the meta section which could've caused legal issues. The expression has been moved into its own file to reduce the length and complexity of `pkgs/top-level/python-packages.nix`. See https://hydra.nixos.org/build/70689499/log See #36453 --- .../python-modules/mrbob/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +---------------- 2 files changed, 29 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/mrbob/default.nix diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix new file mode 100644 index 00000000000..3f974872b95 --- /dev/null +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, argparse, jinja2, six +, fetchPypi, lib +}: + +buildPythonPackage rec { + pname = "mrbob"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "6737eaf98aaeae85e07ebef844ee5156df2f06a8b28d7c3dcb056f811c588121"; + }; + + disabled = isPy3k; + + checkInputs = [ nose glibcLocales mock ]; + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests + ''; + + propagatedBuildInputs = [ argparse jinja2 six ]; + + meta = with stdenv.lib; { + homepage = https://github.com/domenkozar/mr.bob; + description = "A tool to generate code skeletons from templates"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 963b255a887..ba2a8122e5a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9837,30 +9837,7 @@ in { }; - - mrbob = buildPythonPackage rec { - name = "mrbob-${version}"; - version = "0.1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/mr.bob/mr.bob-${version}.tar.gz"; - sha256 = "6737eaf98aaeae85e07ebef844ee5156df2f06a8b28d7c3dcb056f811c588121"; - }; - - buildInputs = [ pkgs.glibcLocales self.mock ]; - - disabled = isPy3k; - - LC_ALL="en_US.UTF-8"; - - propagatedBuildInputs = with self; [ argparse jinja2 six ] ++ - (optionals isPy26 [ importlib ordereddict ]); - - meta = { - homepage = https://github.com/domenkozar/mr.bob.git; - description = "A tool to generate code skeletons from templates"; - }; - }; + mrbob = callPackage ../development/python-modules/mrbob {}; msgpack = callPackage ../development/python-modules/msgpack {};