diff options
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 33626a126492..7d5e08b9c1ce 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -24,7 +24,7 @@ let bump2version = pkgs.python37Packages.callPackage ./bump2version { }; - darcsToGit = callPackage ./darcs-to-git { }; + darcs-to-git = callPackage ./darcs-to-git { }; delta = callPackage ./delta { }; @@ -153,9 +153,9 @@ let 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 { }; @@ -192,7 +192,7 @@ let tig = callPackage ./tig { }; - topGit = callPackage ./topgit { }; + top-git = callPackage ./topgit { }; transcrypt = callPackage ./transcrypt { }; @@ -200,8 +200,12 @@ let } // lib.optionalAttrs (config.allowAliases or true) (with self; { # aliases + darcsToGit = darcs-to-git; gitAnnex = git-annex; + gitFastExport = git-fast-export; + gitRemoteGcrypt = git-remote-gcrypt; svn_all_fast_export = svn-all-fast-export; + topGit = top-git; }); in self diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index e66341b5f8cd..72aecf20ca39 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { buildInputs = [ 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 perlDeps perl nix postgresql # for running the tests @@ -95,7 +95,7 @@ in stdenv.mkDerivation rec { hydraPath = lib.makeBinPath ( [ 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 ] ); nativeBuildInputs = [ autoreconfHook pkgconfig ]; |