diff options
| author | Domen Kožar <domen@dev.si> | 2015-06-01 11:00:51 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-06-01 11:00:51 +0200 |
| commit | dc3316268ecfe7d7e2b44ed7080212f3824124b9 (patch) | |
| tree | c176330237584330a46d40cc32a4e3ceea8fdfe6 /pkgs/applications/version-management | |
| parent | 867d2c5c464fd87268f71942beded17d7e1e5b9c (diff) | |
| parent | 5afa4f18d6173725d593e59f1c4a8f54b575f9fe (diff) | |
| download | nixlib-dc3316268ecfe7d7e2b44ed7080212f3824124b9.tar nixlib-dc3316268ecfe7d7e2b44ed7080212f3824124b9.tar.gz nixlib-dc3316268ecfe7d7e2b44ed7080212f3824124b9.tar.bz2 nixlib-dc3316268ecfe7d7e2b44ed7080212f3824124b9.tar.lz nixlib-dc3316268ecfe7d7e2b44ed7080212f3824124b9.tar.xz nixlib-dc3316268ecfe7d7e2b44ed7080212f3824124b9.tar.zst nixlib-dc3316268ecfe7d7e2b44ed7080212f3824124b9.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 56a6618e5310..a73d16374176 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -46,7 +46,8 @@ rec { sendEmailSupport = !stdenv.isDarwin; }; - gitAnnex = pkgs.haskell-ng.packages.ghc784.git-annex; + inherit (pkgs.haskellPackages) git-annex; + gitAnnex = git-annex; qgit = import ./qgit { inherit fetchurl stdenv; |