Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: MarcWeber/nixpkgs-haskell-overlay
base: 430ce59f56
...
head fork: MarcWeber/nixpkgs-haskell-overlay
compare: 74008a05d6
  • 3 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jan 12, 2012
@MarcWeber link all haskell dependencies to sources-of-deps-auto because modules…
… can be reexported, change default haskell version
c9dc334
Commits on Feb 25, 2012
@MarcWeber yi make yi build again a5b0ae1
Commits on Mar 30, 2012
@MarcWeber updates 74008a0
Showing with 10,092 additions and 5,419 deletions.
  1. +25 −3 default.nix
  2. +10,059 −5,409 hackage/hack-nix-db.nix
  3. +8 −7 patches/alex-2.3.5.patch
View
28 default.nix
@@ -41,7 +41,7 @@ let
inherit pkgs lib getConfig;
- defaultHaskellPackages = pkgs.haskellPackages_ghc721;
+ defaultHaskellPackages = pkgs.haskellPackages_ghc722;
libOverlay =
import pkgs/haskell-lib.nix { inherit (pkgs) fetchurl; inherit lib; };
@@ -228,6 +228,7 @@ let
g_libs.cairo g_libs.glib g_libs.pango
];
};
+ "language-javascript" = { buildInputs = [ alexFixed happyFixed ]; };
haddock = { buildInputs = [ alex235Fixed happyFixed ]; };
leksah = { noHaddock = true; }; # ghc-7, error "can't find transitive deps of haddock"
pango = { buildInputs = [gtk2hsBuildToolsFixed pkgs.pkgconfig pkgs.pango pkgs.glibc]; };
@@ -351,6 +352,21 @@ let
wrappers = true;
citeproc = false;
};
+
+
+ QuickCheck = {
+ curl = true;
+ http = true;
+ static = false;
+ terminfo = true;
+ threaded = false;
+ color = true;
+ mmap = true;
+ hpc = false;
+ "curl-pipelining" = false;
+ "type-witnesses" = false;
+ "deps-only" = false;
+ };
yi = {
ghcInterpreter = false; # Use the "hint" interpreter for extended commands (M-x) (experimental)
ghcAPI = false; # Enable linking with GHC API for advanced features.
@@ -376,6 +392,11 @@ let
else let
deps = dependencies ++ (lib.attrByPath [name "propagatedBuildNativeInputs"] [] ammendmentsFixed);
+ deps_of_haskell_packages = d: [d] ++ (if d ? propagatedHaskellDeps then d.propagatedHaskellDeps else []);
+ # for tag generation we need all "propagated build inputs" at nix level. propagatedBuild*Inputs keeps track
+ # of those at builder level only. Why tagging dependencies of
+ # dependencies? Eg Yesod reexports modules from yesod-core. Thus its enough to depend on Yesod
+ propagatedHaskellDeps = lib.uniqListExt { inputList = lib.concatMap (deps_of_haskell_packages) deps; };
in (
(haskellDerivation (self: (removeAttrs (lib.attrByPath [name] {} ammendmentsFixed) ["buildInputs"]) // {
pname = name;
@@ -396,7 +417,7 @@ let
# temporary hack: there are 2 .cabal files
// (lib.optionalAttrs (fullName == "cabal-install-ghc72-0.10.4") { patchPhase = "rm .*.cabal"; })
- ))// { inherit deps; ghc = thisGhc; });
+ ))// { inherit deps propagatedHaskellDeps; ghc = thisGhc; });
});
@@ -467,11 +488,12 @@ let
hackNix = exeByName { haskellPackages = pkgs.haskellPackages_ghc703; name = "hack-nix"; };
nixRepositoryManager = exeByName { name = "nix-repository-manager"; };
# doesn't build
- yi = exeByName { name = "yi"; };
+ yi = exeByName { name = "yi"; haskellPackages = pkgs.haskellPackages_ghc704; };
# yiVty = exeByName { name = "yi-vty"; };
# yiGtk = exeByName { name = "yi-gtk"; };
haddock = exeByName { name = "haddock"; };
darcs = exeByName { name = "darcs"; };
+ mboxTools = exeByName { name = "mbox-tools"; };
terrahs = exeByName { name = "terrahs"; };
cabalInstall = exeByName { name = "cabal-install"; };
View
15,468 hackage/hack-nix-db.nix
10,059 additions, 5,409 deletions not shown
View
15 patches/alex-2.3.5.patch
@@ -1,7 +1,7 @@
diff -r -U 3 a/alex.cabal b/alex.cabal
--- a/alex.cabal 1970-01-01 01:00:01.000000000 +0100
-+++ b/alex.cabal 2011-03-14 00:08:54.000000000 +0100
-@@ -68,7 +68,7 @@
++++ b/alex.cabal 2012-02-26 05:13:46.193965082 +0100
+@@ -68,12 +68,12 @@
if flag(small_base)
build-depends: base >= 2.1, array, containers, directory
else
@@ -10,8 +10,9 @@ diff -r -U 3 a/alex.cabal b/alex.cabal
build-depends: base < 5
-Only in b: alex.cabal.orig
-Only in b/dist: alex-2.3.5.tar.gz
-Only in b: Setup
-Only in b: Setup.hi
-Only in b: Setup.o
+ extensions: CPP
+- ghc-options: -Wall
++ ghc-options: -Wall -XBangPatterns
+ other-modules:
+ AbsSyn
+ CharSet

No commit comments for this range

Something went wrong with that request. Please try again.