ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 22:03:54 +03:00
Code Issues Projects Releases Wiki Activity

git-annex: build w/o assistant in Stackage, with assistant for Nixpkgs

Browse Source
This commit is contained in:
Peter Simons 2015-09-18 16:50:22 +02:00
parent 4bb32a1e4d
commit 07f8f50c6d
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 {

18
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -57,8 +57,22 @@ self: super: {
# Link the proper version.
zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };
# These changes are required to support Darwin.
git-annex = (disableSharedExecutables super.git-annex).override {
# This package needs a little help compiling properly on Darwin. Furthermore,
# Stackage compiles git-annex without the Assistant, supposedly because not
# all required dependencies are part of Stackage. To comply with Stackage, we
# make 'git-annex-without-assistant' our default version, but offer another
# build which has the assistant to be used in the top-level.
git-annex_5_20150916 = (disableCabalFlag super.git-annex_5_20150916 "assistant").override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
};
git-annex = (disableCabalFlag super.git-annex "assistant").override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
};
git-annex-with-assistant = super.git-annex.override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;