Many minor fixes to get things building after recent compiler changes

This commit is contained in:
John Wiegley 2014-08-10 23:18:57 -05:00
parent b9bd655b16
commit 326ca0f690
10 changed files with 43 additions and 25 deletions

View file

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
sha256 = "194y341zrpjp75mc3099kjc0inr1d379wwsnav257bwsc967h8yx";
};
patches = [ ./darwin-new-sections.patch ];
buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ];
postUnpack = ''
@ -53,16 +55,13 @@ stdenv.mkDerivation rec {
postInstall = ''
cat >$out/share/emacs/site-lisp/site-start.el <<EOF
;; nixos specific load-path
(when (getenv "NIX_PROFILES")
(setq load-path
(append (reverse
(mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
(when (getenv "NIX_PROFILES") (setq load-path
(append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
(split-string (getenv "NIX_PROFILES"))))
load-path)))
;; make tramp work for NixOS machines
(eval-after-load 'tramp
'(add-to-list 'tramp-remote-path "/run/current-system/sw/bin"))
(eval-after-load 'tramp '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin"))
EOF
'';

View file

@ -0,0 +1,27 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit
, mtl, QuickCheck, scientific, syb, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2, text, time
, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "aeson";
version = "0.7.0.6";
sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4";
buildDepends = [
attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
text time unorderedContainers vector
];
testDepends = [
attoparsec HUnit QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2 text time unorderedContainers vector
];
meta = {
homepage = "https://github.com/bos/aeson";
description = "Fast JSON parsing and encoding";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
sha256 = "1r30vcrplilj3silnrmn0r5m0df27icdsgd5hx35li9yrs862n95";
isLibrary = true;
isExecutable = true;
doCheck = false;
buildDepends = [
aeson ansiWlPprint binary cassava deepseq either filepath Glob
hastache mtl mwcRandom optparseApplicative parsec statistics text

View file

@ -1,14 +1,12 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cereal, gccApple, mtl, text }:
{ cabal, cereal, mtl, text }:
cabal.mkDerivation (self: {
pname = "hfsevents";
version = "0.1.5";
sha256 = "0hp9jjj59smfcs51d9zjhyvgdbn46l0rl0jr98wbzg3qya0vwj5k";
buildDepends = [ cereal mtl text ];
buildTools = [ gccApple ];
configureFlags = "--ghc-option=-pgmc=${gccApple}/bin/gcc";
meta = {
homepage = "http://github.com/luite/hfsevents";
description = "File/folder watching for OS X";

View file

@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
description = "Library and utilities for working with the TIFF image file format";
homepage = http://www.remotesensing.org/libtiff/;
license = "bsd";
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ autoconf automake pcre ];
configureFlags = [
"--enable-lenient"
"--enable-conffile=${if confFile == null then "no" else confFile}"
"--with-pcre=yes"
];

View file

@ -8,7 +8,7 @@ let
# manually, so we have to duplicate the know how here.
systemFlags =
if stdenv.isDarwin then ''
CFLAGS="-O2 -Wall -fomit-frame-pointer -no-cpp-precomp"
CFLAGS="-O2 -Wall -fomit-frame-pointer"
LDFLAGS=
EXTRA_OBJS=strverscmp.o
'' else if stdenv.isCygwin then ''

View file

@ -8390,10 +8390,7 @@ let
}));
emacs24Macport = lowPrio (callPackage ../applications/editors/emacs-24/macport.nix {
# resolve unrecognised flag '-fconstant-cfstrings' errors
stdenv = if stdenv.isDarwin
then clangStdenv
else stdenv;
stdenv = pkgs.clangStdenv;
});
emacsPackages = emacs: self: let callPackage = newScope self; in rec {
@ -9770,13 +9767,7 @@ let
trayer = callPackage ../applications/window-managers/trayer { };
tree = callPackage ../tools/system/tree {
# use gccApple to compile on darwin as the configure script adds a
# -no-cpp-precomp flag, which is not compatible with the default gcc
stdenv = if stdenv.isDarwin
then stdenvAdapters.overrideGCC stdenv gccApple
else stdenv;
};
tree = callPackage ../tools/system/tree {};
tribler = callPackage ../applications/networking/p2p/tribler { };

View file

@ -27,13 +27,13 @@
};
ghc763Prefs = self : super : ghc783Prefs self super // {
aeson = self.aeson_0_7_0_4;
aeson = self.aeson_0_7_0_6;
ariadne = super.ariadne.override {
haskellNames = self.haskellNames.override {
haskellPackages = self.haskellPackages.override { Cabal = self.Cabal_1_18_1_3; };
};
};
attoparsec = self.attoparsec_0_11_3_1;
attoparsec = self.attoparsec_0_11_3_4;
binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_1; };
bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_1; }; };
criterion = super.criterion.override {
@ -50,7 +50,7 @@
distributedStatic = super.distributedStatic.override { binary = self.binary_0_7_2_1; };
networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_1; };
distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_1; };
scientific = self.scientific_0_2_0_2;
scientific = self.scientific_0_3_3_0;
singletons = null; # requires base >= 4.7
transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x
zipArchive = super.zipArchive_0_2_2_1; # works without binary 0.7.x

View file

@ -142,6 +142,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
AES = callPackage ../development/libraries/haskell/AES {};
aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; };
aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; };
aeson_0_8_0_0 = callPackage ../development/libraries/haskell/aeson/0.8.0.0.nix { blazeBuilder = null; };
aeson = self.aeson_0_8_0_0;