public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-and-tools: canonicalize hyphenated names

Browse Source 
Old intercaps names are aliased.

darcs-to-git: rename from darcsToGit
git-fast-export: rename from gitFastExport
git-remote-gcrypt: rename from gitRemoteGcrypt
hub-unstable: rename from hubUnstable
top-git: rename from topGit
This commit is contained in:
bb010g 2019-10-18 19:30:06 -07:00 committed by Dusk Banks
parent 925404027a
commit a7cb757af4
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -24,7 +24,7 @@ let
bump2version = pkgs.python37Packages.callPackage ./bump2version { }; bump2version = pkgs.python37Packages.callPackage ./bump2version { };
darcsToGit = callPackage ./darcs-to-git { }; darcs-to-git = callPackage ./darcs-to-git { };
delta = callPackage ./delta { }; delta = callPackage ./delta { };
@ -153,9 +153,9 @@ let
git2cl = callPackage ./git2cl { }; git2cl = callPackage ./git2cl { };
gitFastExport = callPackage ./fast-export { }; git-fast-export = callPackage ./fast-export { };
gitRemoteGcrypt = callPackage ./git-remote-gcrypt { }; git-remote-gcrypt = callPackage ./git-remote-gcrypt { };
gitflow = callPackage ./gitflow { }; gitflow = callPackage ./gitflow { };
@ -192,7 +192,7 @@ let
tig = callPackage ./tig { }; tig = callPackage ./tig { };
topGit = callPackage ./topgit { }; top-git = callPackage ./topgit { };
transcrypt = callPackage ./transcrypt { }; transcrypt = callPackage ./transcrypt { };
@ -200,8 +200,12 @@ let
} // lib.optionalAttrs (config.allowAliases or true) (with self; { } // lib.optionalAttrs (config.allowAliases or true) (with self; {
# aliases # aliases
darcsToGit = darcs-to-git;
gitAnnex = git-annex; gitAnnex = git-annex;
gitFastExport = git-fast-export;
gitRemoteGcrypt = git-remote-gcrypt;
svn_all_fast_export = svn-all-fast-export; svn_all_fast_export = svn-all-fast-export;
topGit = top-git;
}); });
in in
self self

4
pkgs/development/tools/misc/hydra/default.nix
View File

@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx
gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt gitAndTools.top-git mercurial darcs subversion bazaar openssl bzip2 libxslt
guile # optional, for Guile + Guix support guile # optional, for Guile + Guix support
perlDeps perl nix perlDeps perl nix
postgresql # for running the tests postgresql # for running the tests
@ -95,7 +95,7 @@ in stdenv.mkDerivation rec {
hydraPath = lib.makeBinPath ( hydraPath = lib.makeBinPath (
[ sqlite subversion openssh nix coreutils findutils pixz [ sqlite subversion openssh nix coreutils findutils pixz
gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial darcs gnused bazaar
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];