[Nix-dev] Re: [Nix-commits] SVN commit: nix - r28597 - in nixpkgs/trunk/pkgs/desktops/kde-4.7: . accessibility artwork bindings edu files graphics kde-package kdeaccessibility kdeadmin kdeartwork kdebase kdebindings kdeedu kd...

[Eelco Dolstra]

Hi,

On 08/15/2011 08:06 PM, Yury G. Kudryashov wrote:

> Big kde-4.7.0 update
>
> * Remove a lot of code duplication.
> * Package almost all (except for smoke-based bindings).

Thanks for doing this hard work :-)

One of these changes seems to have broken KDE 4.5:

   http://hydra.nixos.org/build/1253523

> -  kdeaccessibility = combinePkgs "kdeaccessibility" {

Are these attribute sets still available?  I see a lot of listToAttrs 
magic so it's not clear to me.

> +++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/4.7.0.nix	Mon Aug 15 18:06:26 2011	(r28597)
> @@ -0,0 +1 @@
> +{stable=true;hashes=builtins.listToAttrs[{name="blinken";value="1g4vpwbal6d7ypmq6l8dh17gi249cd261hsa4bjkvb0wx88i66qr";}{name="cantor";value="0xb4xja9ab4kzgzpikhlkrl68287lqdigvl6pzbh9m6g0ghlp697";}{name="gwenview";value="14a1mjcfcw4nq2c5qkvca8mgdrr31gm24l9nlkcj7p8yrpkxfykh";}{name="kalgebra";value="140528rn3zx489g1lawr1n19i3rrc58h2ii8gh46dnlfcgig13bb";}{name="kalzium";value="1vfa9kdxrdfqqfad0dp2pwi919qs5pbgdk7jmi4dccwlhgmv3226";}{name="kamera";value="02g3mh14rfyrmpa3r8m5pqzxhs4kdb3xvg34434g9r51v3am3ypk";}{name="kanagram";value="04hv13mij4kg8bifs690q4qxr4qk7dnviihlc297x434l0iz2spd";}{name="kate";value="0bd0b354a7cx8cmw2d5pbqn0an38xls86454gclyjd1ilr3l41m9";}{name="kbruch";value="169c6xq0jvp9cv6p9ypk8sryxsh711xdgbs02yiqd476ykavj3jv";}{name="kcolorchooser";value="1f7nj9ccvf1bg3nnm7xchaqvfnskkbnd1h2xd5fxmj9fz1195kqv";}{name="kdeaccessibility";value="01qx0w5dylkbxchj5kg9iawdc0rjbxv1w1dg90ld98fn583g70ws";}{name="kdeadmin";value="1zm6p65wgdn0rv9vzcm89vsiw1696g0bf7kshvwnjmsfc9whsgq3
";
>   }{name="kdeartwork";value="12cqpam82k086088i2p1318y1vjr7c8iffppnm6mkbllg2g8ydip";}
[snip]

Maybe you can cause the generator to emit some newlines between elements 
for readability?

> -#!/bin/sh
> +#!/usr/bin/env bash

We don't have /usr/bin/env on NixOS...

> +{ kde, pkgconfig, pythonPackages, sip, pycups, pygobject, system_config_printer,
> +  kdelibs, kdepimlibs, pykde4, cups, nettools }:

Can you write this as

{ kde, pkgconfig, pythonPackages, sip, pycups, pygobject, 
system_config_printer
, kdelibs, kdepimlibs, pykde4, cups, nettools }:

i.e. put the "," at the start of the next line?

> +kde {
> +  buildInputs = [ kdelibs kdepimlibs pythonPackages.python pycups pykde4 sip
> +    pygobject s_c_p ];

Please write multi-line lists as

   buildInputs =
     [ kdelibs kdepimlibs pythonPackages.python pycups pykde4 sip
       pygobject s_c_p
     ];

> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdeartwork/ColorSchemes.nix	Mon Aug 15 18:06:26 2011	(r28597)

I assume that this file was copied from artwork/color-schemes.nix.  If 
that's the case, then please use "svn cp" to preserve history (makes it 
easier to see what changed).

-- 
Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/