diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index f30a47a78b9a..c735ef4506a4 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/nirvdrum/svn2git; - description = "Ruby tool for importing existing svn projects into git"; + description = "Tool for importing Subversion repositories into git"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.the-kenny ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98e2fa37b2fb..91b51224c5e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11490,14 +11490,13 @@ let gitAndTools = recurseIntoAttrs (import ../applications/version-management/git-and-tools { inherit pkgs; }); - git = gitAndTools.git; - gitFull = gitAndTools.gitFull; + + inherit (gitAndTools) git gitFull gitSVN git-cola svn2git; + gitMinimal = git.override { withManual = false; pythonSupport = false; }; - gitSVN = gitAndTools.gitSVN; - git-cola = gitAndTools.git-cola; gitRepo = callPackage ../applications/version-management/git-repo { python = python27;