diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-26 15:54:16 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-26 15:54:16 +0000 |
commit | 0babf18003b92ef726d5bebd2c3651a759a24e49 (patch) | |
tree | 385c931c5f6d5f46dd08b84da6929959a730cae6 /pkgs/development/tools | |
parent | ca3531850844e185d483fb878fcd00c6b44069e5 (diff) | |
parent | ddb272bf1d738ec0ae812ecc72e8d65eb06d2173 (diff) | |
download | nixlib-0babf18003b92ef726d5bebd2c3651a759a24e49.tar nixlib-0babf18003b92ef726d5bebd2c3651a759a24e49.tar.gz nixlib-0babf18003b92ef726d5bebd2c3651a759a24e49.tar.bz2 nixlib-0babf18003b92ef726d5bebd2c3651a759a24e49.tar.lz nixlib-0babf18003b92ef726d5bebd2c3651a759a24e49.tar.xz nixlib-0babf18003b92ef726d5bebd2c3651a759a24e49.tar.zst nixlib-0babf18003b92ef726d5bebd2c3651a759a24e49.zip |
Merge pull request #71378 from bb010g/git-my
git-my: init at 1.1.2
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
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 ]; |