diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2008-03-19 22:32:00 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2008-03-19 22:32:00 +0000 |
| commit | ae475a72bf0304922b0a46ac828d866d9c10b30a (patch) | |
| tree | b4574a1947420886bf4878defc7684711af0fba8 | |
| parent | 1e2a4064f4bbf823622b9a32d51616576d6cd4d2 (diff) | |
| download | nixpkgs-ae475a72bf0304922b0a46ac828d866d9c10b30a.tar nixpkgs-ae475a72bf0304922b0a46ac828d866d9c10b30a.tar.gz nixpkgs-ae475a72bf0304922b0a46ac828d866d9c10b30a.tar.bz2 nixpkgs-ae475a72bf0304922b0a46ac828d866d9c10b30a.tar.lz nixpkgs-ae475a72bf0304922b0a46ac828d866d9c10b30a.tar.xz nixpkgs-ae475a72bf0304922b0a46ac828d866d9c10b30a.tar.zst nixpkgs-ae475a72bf0304922b0a46ac828d866d9c10b30a.zip | |
renamed subversion-<version>-svnmerge to svmerge-version (fixed my breakage of nixos-checkout : nix-env -i subversion)
svn path=/nixpkgs/trunk/; revision=11211
| -rw-r--r-- | pkgs/applications/version-management/subversion-1.4.x/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/version-management/subversion-1.4.x/svnmerge.nix | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/subversion-1.4.x/default.nix b/pkgs/applications/version-management/subversion-1.4.x/default.nix index d09176302b8..ce1e0f6b406 100644 --- a/pkgs/applications/version-management/subversion-1.4.x/default.nix +++ b/pkgs/applications/version-management/subversion-1.4.x/default.nix @@ -16,8 +16,11 @@ assert javahlBindings -> jdk != null; assert sslSupport -> neon.sslSupport; assert compressionSupport -> neon.compressionSupport; -stdenv.mkDerivation { - name = "subversion-1.4.6"; +stdenv.mkDerivation rec { + + version = "1.4.6"; # attribute version is used within svnmerge as well + + name = "subversion-${version}"; builder = ./builder.sh; src = fetchurl { diff --git a/pkgs/applications/version-management/subversion-1.4.x/svnmerge.nix b/pkgs/applications/version-management/subversion-1.4.x/svnmerge.nix index 34e9a0156fb..9c8b0349f4a 100644 --- a/pkgs/applications/version-management/subversion-1.4.x/svnmerge.nix +++ b/pkgs/applications/version-management/subversion-1.4.x/svnmerge.nix @@ -1,6 +1,6 @@ {subversion, stdenv, python, shebangfix }: stdenv.mkDerivation { - name = "${subversion.name}-svnmerge"; + name = "svnmerge-${subversion.version}"; src = subversion.src; |