about summary refs log tree commit diff
path: root/pkgs/applications/version-management
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-09-18 16:50:22 +0200
committerPeter Simons <simons@cryp.to>2015-09-19 08:20:54 +0200
commit07f8f50c6d3c1f0e28c8ca734dfd1203ac9e7061 (patch)
treeeee24171770c40bb14ed28f20dc0b4e369acb013 /pkgs/applications/version-management
parent4bb32a1e4dd73871c0891a1a4f9dc3c25428f009 (diff)
downloadnixlib-07f8f50c6d3c1f0e28c8ca734dfd1203ac9e7061.tar
nixlib-07f8f50c6d3c1f0e28c8ca734dfd1203ac9e7061.tar.gz
nixlib-07f8f50c6d3c1f0e28c8ca734dfd1203ac9e7061.tar.bz2
nixlib-07f8f50c6d3c1f0e28c8ca734dfd1203ac9e7061.tar.lz
nixlib-07f8f50c6d3c1f0e28c8ca734dfd1203ac9e7061.tar.xz
nixlib-07f8f50c6d3c1f0e28c8ca734dfd1203ac9e7061.tar.zst
nixlib-07f8f50c6d3c1f0e28c8ca734dfd1203ac9e7061.zip
git-annex: build w/o assistant in Stackage, with assistant for Nixpkgs
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r--pkgs/applications/version-management/git-and-tools/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index adf8027bf27d..12ca1434466b 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -1,6 +1,6 @@
-/* moving all git tools into one attribute set because git is unlikely to be
- * referenced by other packages and you can get a fast overview.
-*/
+/* All git-relates tools live here, in a separate attribute set so that users
+ * can get a fast overview over what's available.
+ */
 args @ {pkgs}: with args; with pkgs;
 let
   inherit (pkgs) stdenv fetchgit fetchurl subversion;
@@ -46,7 +46,7 @@ rec {
     sendEmailSupport = !stdenv.isDarwin;
   };
 
-  inherit (pkgs.haskellPackages) git-annex;
+  git-annex = pkgs.haskellPackages.git-annex-with-assistant;
   gitAnnex = git-annex;
 
   qgit = import ./qgit {