[Nix-dev] Re: [Nix-commits] SVN commit: nix - 18894 - MarcWeber - in nixpkgs/trunk/pkgs: applications/misc/synergy applications/networking/browsers/netsurf applications/version-management/git-and-tools applications/version-management/git-and-tools/fast-export applications/version-management/git-and-tools/git applications/version-management/git-and-tools/qgit applications/video/MPlayer applications/video/cinelerra build-support development/compilers/haxe development/compilers/neko development/interpreters/octave development/interpreters/python-new/2.5 development/libraries/haskell/get-options development/libraries/haskell/ghc-syb development/misc development/tools/misc development/tools/misc/ctags misc misc/lilypond os-specific/linux/autofs top-level

[Eelco Dolstra]

Hi,

Marc Weber wrote:

>    nixpkgs/trunk/pkgs/build-support/source-from-head-fun.nix

I'm sure it's fun, but that doesn't have to be expressed in the name ;-)

> Log:
> removing old bleeding edge cruft replacing it by a niftier version using
> source regions which are substituded by the tool nix-repository-manager.
> See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.
> 
> sourceByName is called sourceFromHead now.
> 
> updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
> cinelerra does no longer build due to Xorg update

A general point about using "bleeding edge" revisions: if software is so
bleeding edge that there are no release tarballs, then maybe we shouldn't be
packaging it.

> -    src = bleedingEdgeRepos.sourceByName "libdom";
> +    # REGION AUTO UPDATE:     { name="libdom"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/dom"; groups = "netsurf_group"; }

What does "groups" do?

> +    src= sourceFromHead "libdom-9721.tar.gz"
> +                 (fetchurl { url = "http://mawercer.de/~nix/repos/libdom-9721.tar.gz"; sha256 = "ca4b94a8dd32036787331a14133c36a49daded40bdb4c04edc3eab99e2193abc"; });
> +    # END

This should follow proper indentation (and it should be "src = ", not "src= ").

What does `sourceFromHead "libdom-9721.tar.gz"' do?  Shouldn't the fetchurl be
enough?

>    netsurfHaru = import ./haru.nix {
> -    inherit fetchurl stdenv lib zlib libpng; 
> -    inherit (bleedingEdgeRepos) sourceByName;
> +    inherit fetchurl sourceFromHead stdenv lib zlib libpng; 

It's not necessary to pass lib to a package, since it's already passed through
stdenv.lib.  And maybe sourceFromHead should be in lib (assuming it's needed at
all).  Then it would not have to be passed as a separate argument either.

> --- nixpkgs/trunk/pkgs/applications/networking/browsers/netsurf/libCSS.nix	2009-12-11 13:58:17 UTC (rev 18893)
> +++ nixpkgs/trunk/pkgs/applications/networking/browsers/netsurf/libCSS.nix	2009-12-11 13:58:23 UTC (rev 18894)
> @@ -2,7 +2,10 @@
>  stdenv.mkDerivation {
>    name = "libCSS-devel";

This package (and others as well) lacks a version number in the name.  It should
be something like "libCSS-1.2.3pre9721".  Also, "-devel" is a bad choice because
it suggests a development package as used in other package managers (i.e.
containing header files and stuff).

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