[Nix-dev] Re: gitorious mirror -Python refactoring again (second attempt)

[Ludovic Courtès]

Hello Marc,

Next time please send separate messages for unrelated things.

Marc Weber <marco-oweber at gmx.de> writes:

> commit cd7c4d85b55c9c2a399faa52a1bb5bb014e54c40
> Author: Marc Weber <marco-oweber at gmx.de>
> Date:   Sun May 9 13:11:54 2010 +0200
>
>     little Python refactoring:
>     - move buildPythonPackage setuptools into python-packages removing
>       duplication
>     - Add pythonFullBuilder because iotop requires ncurses
>       tidy up offlineimap (and update moved url)
>     - make buildPythonPackage default to buildPython26Package so that its
>       consistent to pythonPackages which defaults to python26Packages
>
> diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
> index fe9225d..0af8a2a 100644
> --- a/pkgs/tools/networking/offlineimap/default.nix
> +++ b/pkgs/tools/networking/offlineimap/default.nix
> @@ -4,8 +4,9 @@ buildPythonPackage {
>    name = "offlineimap-6.2.0";
>  
>    src = fetchurl {
> -    url = "http://software.complete.org/software/attachments/download/413/offlineimap_6.2.0.orig.tar.gz";
> -    sha256 = "057pcz2291mdpkjyrwdzxfg831337sg7bbqyxmwfy42k7np5bdi4";
> +    url = "http://github.com/jgoerzen/offlineimap/tarball/debian/6.2.0";
> +    name = "offlineimap-6.2.0.tgz";
> +    sha256 = "00rm2a68ab1cgymxsknnck29ag0lsy2wi9bxkfh04d7z28jy6xyq";
>    };

That’s unrelated.

> +  buildPython26Package = python26Packages.buildPythonPackage;

[...]

>    python26Packages = recurseIntoAttrs (import ./python-packages.nix {
>      inherit pkgs;
>      python = python26;
> +    pythonFull = python26Full;
>      buildPythonPackage = buildPython26Package;
>    });

The definition of ‘buildPython26Package’ looks somewhat circular to me.
Am I missing something?

> --- a/pkgs/top-level/python-packages.nix
> +++ b/pkgs/top-level/python-packages.nix
> @@ -1,7 +1,19 @@
> -{ pkgs, python, buildPythonPackage }:
> +{ pkgs, python, pythonFull, buildPythonPackage }:

Please keep only one ‘python’ argument.  This function can be called
with ‘python = pythonFull’ if need be; there’s no need to add a new
argument.

> @@ -598,6 +609,11 @@ rec {
>      };
>    });
>  
> +  setuptools = builderDefsPackage (import ../development/python-modules/setuptools) {
> +    inherit makeWrapper;
> +    inherit python;
> +  };

IMO Setuptools doesn’t belong in ‘python-packages.nix’ since it’s not
built with ‘buildPythonPackage’.

> commit 17ae280f809bf8fad3846ba5dfd1f54412a585f2
> Author: Marc Weber <marco-oweber at gmx.de>
> Date:   Sun May 9 22:56:12 2010 +0200
>
>     adding iotop

Unrelated.

> +  iotop = buildPythonFullPackage {
> +    name = "iotop-0.4";
> +
> +    src = fetchurl {
> +      url = http://guichaz.free.fr/iotop/files/iotop-0.4.tar.bz2;
> +      sha256 = "00a7f80cp12bi48pb8z7v1839pni4xpp99jhmrwlqmqb98ik7n89";
> +    };
> +
> +    buildInputs = [python];

Useless ‘buildInputs’.

> +    checkPhase = ":";

‘doCheck = false’, rather.

> +      homepage = "http://guichaz.free.fr/iotop/";
> +      license = "GPL";

GPLv2+, GPLv3+, etc.?

Thanks,
Ludo’.