renamed subversion-<version>-svnmerge to svmerge-version (fixed my breakage of nixos-checkout : nix-env -i subversion)

svn path=/nixpkgs/trunk/; revision=11211
This commit is contained in:
Marc Weber 2008-03-19 22:32:00 +00:00
parent 1e2a4064f4
commit ae475a72bf
2 changed files with 6 additions and 3 deletions

View File

@ -16,8 +16,11 @@ assert javahlBindings -> jdk != null;
assert sslSupport -> neon.sslSupport; assert sslSupport -> neon.sslSupport;
assert compressionSupport -> neon.compressionSupport; assert compressionSupport -> neon.compressionSupport;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "subversion-1.4.6";
version = "1.4.6"; # attribute version is used within svnmerge as well
name = "subversion-${version}";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {

View File

@ -1,6 +1,6 @@
{subversion, stdenv, python, shebangfix }: {subversion, stdenv, python, shebangfix }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${subversion.name}-svnmerge"; name = "svnmerge-${subversion.version}";
src = subversion.src; src = subversion.src;