[Nix-dev] commit review (ludo, Karn, eelco)

[Marc Weber]

1) ludo
2) Karn
3) eelco

1)
  Author: ludo

  Modified: nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git
  ==============================================================================
  --- nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git    Mon Mar 14 21:13:35 2011    (r26304)
  +++ nixpkgs/trunk/pkgs/build-support/fetchgit/nix-prefetch-git    Mon Mar 14 22:00:20 2011    (r26305)
  @@ -120,6 +120,17 @@
       # Checkout linked sources.
       init_submodules;
   
  +    if [ -f .topdeps ]; then
  +    if tg help 2>&1 > /dev/null
  +    then
  +        echo "populating TopGit branches..."
  +        tg remote --populate origin
  +    else
  +        echo "WARNING: would populate TopGit branches but TopGit is not available" >&2
  +        echo "WARNING: install TopGit to fix the problem" >&2
  +    fi
  +    fi
  +
       cd $top;
 }
 
I've trouble with the wording "problem".

The topic branches are fetched as remotes anyway.
top-git is only important if you want to run tg update. 
However doing so will create local hashes which do not exist on a remote
server thus its useless.
So not using top-git is not a "problem".

The real question is: should nix-prefetch-git populate local branches
for all remote branches automatically?
It looks to me like you tried doing that.

Your comments suggest that you should install top-git because otherwise
something doesn't work which is not the case.

Without git you can still git checkout origin/NAME etc. 

2)
  Update flapjax compiler
  Let me show you how to use hack-nix because you can do this
  automatically by nix-repository-manager 1 . --update flapjax and be
  done.

3) merge failure (xorg-updates)

    -  firefox40Pkgs = let p = (applyGlobalOverrides (x : {cairo = x.cairo_1_10_0;}));
    -  in p.callPackage
    -      ../applications/networking/browsers/firefox/4.0.nix {
    +  firefox40Pkgs = callPackage ../applications/networking/browsers/firefox/4.0.nix {
         inherit (p.gtkLibs) gtk pango;
         inherit (p.gnome) libIDL;
       };

  Source is broken anyway and the result doesn't run (?) See other thread. So
  its not very important ?

  Thanks for doing it. With some luck I can get rid of the proprietary ATI driver now.
  I'll try and provide feedback soon.

Marc Weber