[bug-gsrc] Re: Nix on ‘fencepost’

[Brian Gough]

At Mon, 15 Mar 2010 22:51:16 +0100,
Ludovic Courtès wrote:
> 
> Hello GNU SRC!  :-)
> 
> Brian Gough <address@hidden> writes:
> 
> > The next step will be to have a nix expression for all the GNU
> > packages (and any necessary dependencies) that we can use to compile
> > the "GNU Source Release Collection" and check that it all works
> > together.
> >
> > We can continue this discussion on address@hidden as the
> > installation on fencepost is part of the bootstrapping for that.
> 
> Sure.  Nixpkgs{,-libre} already show the status of GNU packages built
> from recent tarballs.
> 
> The attached Guile script provides an approximate list of GNU packages
> available in Nixpkgs.  The output for ‘trunk’ is shown below.

I'm trying to update my nixpkgs-libre repo to try the script. Do I
need to have topgit installed now?  Every time I do a pull I get an
error.

$ git reset --hard
HEAD is now at f80f53e... Merge commit 'refs/top-bases/t/nixpkgs-libre' into 
t/nixpkgs-libre
$ git clean -f -d
$ git pull
CONFLICT (delete/modify): pkgs/applications/misc/googleearth/default.nix 
deleted in HEAD and modified in 8c635c1e67f588be24a9daa9817688eae4eb7081. 
Version 8c635c1e67f588be24a9daa9817688eae4eb7081 of 
pkgs/applications/misc/googleearth/default.nix left in tree.
Removed pkgs/applications/virtualization/qemu/0.12.2.nix
Removed pkgs/misc/busybox/busybox-1.1.nix
Removed pkgs/misc/busybox/busybox-1.2.nix
Removed pkgs/misc/busybox/busybox-1.3.nix
Removed pkgs/misc/busybox/mips-config-1.1
Removed pkgs/misc/busybox/x86-config-1.2
CONFLICT (delete/modify): pkgs/os-specific/linux/nvidia-x11/default.nix deleted 
in HEAD and modified in 8c635c1e67f588be24a9daa9817688eae4eb7081. Version 
8c635c1e67f588be24a9daa9817688eae4eb7081 of 
pkgs/os-specific/linux/nvidia-x11/default.nix left in tree.
Removed pkgs/os-specific/linux/uclibc/unifdef-getline.patch
Auto-merged pkgs/top-level/all-packages.nix
Automatic merge failed; fix conflicts and then commit the result.
$