Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c9bed891f607
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d41f7655fb63
Choose a head ref
2 contributors
Loading
119 changes: 0 additions & 119 deletions pkgs/development/compilers/ghc/8.2.1.nix
View file

This file was deleted.

113 changes: 38 additions & 75 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -15,13 +15,6 @@ with haskellLib;

self: super: {

attoparsec-time_1 = super.attoparsec-time_1.override {
doctest = super.doctest_0_13_0;
};
attoparsec-data = super.attoparsec-data.override {
attoparsec-time = self.attoparsec-time_1;
};

# This used to be a core package provided by GHC, but then the compiler
# dropped it. We define the name here to make sure that old packages which
# depend on this library still evaluate (even though they won't compile
@@ -39,9 +32,8 @@ self: super: {
# compiled on Linux. We provide the name to avoid evaluation errors.
unbuildable = throw "package depends on meta package 'unbuildable'";

# cabal-install needs Cabal 2.x. hackage-security's test suite does not compile with
# Cabal 2.x, though. See https://github.com/haskell/hackage-security/issues/188.
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; });
# hackage-security's test suite does not compile with Cabal 2.x.
# See https://github.com/haskell/hackage-security/issues/188.
hackage-security = dontCheck super.hackage-security;

# Link statically to avoid runtime dependency on GHC.
@@ -64,6 +56,7 @@ self: super: {
nanospec = dontCheck super.nanospec;
options = dontCheck super.options;
statistics = dontCheck super.statistics;
vector-builder = dontCheck super.vector-builder;

# https://github.com/gilith/hol/pull/1
hol = appendPatch (doJailbreak super.hol) (pkgs.fetchpatch {
@@ -88,9 +81,7 @@ self: super: {

# The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
# https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
git-annex = (overrideCabal (super.git-annex.overrideScope (self: super: {
optparse-applicative = self.optparse-applicative_0_14_0_0;
})) (drv: {
git-annex = (overrideCabal super.git-annex (drv: {
src = pkgs.fetchgit {
name = "git-annex-${drv.version}-src";
url = "git://git-annex.branchable.com/";
@@ -152,8 +143,6 @@ self: super: {
extraLibraries = [ pkgs.openblasCompat ];
});

LambdaHack = super.LambdaHack.override { sdl2-ttf = super.sdl2-ttf_2_0_2; };

# The Haddock phase fails for one reason or another.
acme-one = dontHaddock super.acme-one;
attoparsec-conduit = dontHaddock super.attoparsec-conduit;
@@ -453,11 +442,6 @@ self: super: {
# https://github.com/basvandijk/threads/issues/10
threads = dontCheck super.threads;

# https://github.com/NixOS/nixpkgs/issues/32138
purescript = super.purescript.override {
optparse-applicative = self.optparse-applicative_0_14_0_0;
};

# Missing module.
rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5
rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6
@@ -504,26 +488,6 @@ self: super: {
# https://github.com/junjihashimoto/test-sandbox-compose/issues/2
test-sandbox-compose = dontCheck super.test-sandbox-compose;

# Relax overspecified constraints. Unfortunately, jailbreak won't work.
pandoc = overrideCabal super.pandoc (drv: {
preConfigure = "sed -i -e 's,time .* < 1.6,time >= 1.5,' -e 's,haddock-library >= 1.1 && < 1.3,haddock-library >= 1.1,' pandoc.cabal";
});

# pandoc 2 dependency resolution
hslua_0_9_3 = super.hslua_0_9_3.override { lua5_1 = pkgs.lua5_3; };
hslua-module-text = super.hslua-module-text.override { hslua = self.hslua_0_9_3; };
texmath_0_10 = super.texmath_0_10.override { pandoc-types = self.pandoc-types_1_17_3; };
pandoc_2_0_5 = super.pandoc_2_0_5.override {
doctemplates = self.doctemplates_0_2_1;
pandoc-types = self.pandoc-types_1_17_3;
skylighting = self.skylighting_0_4_4_1;
texmath = self.texmath_0_10;
};
pandoc-citeproc_0_12_1_1 = super.pandoc-citeproc_0_12_1_1.override {
pandoc = self.pandoc_2_0_5;
pandoc-types = self.pandoc-types_1_17_3;
};

# https://github.com/tych0/xcffib/issues/37
xcffib = dontCheck super.xcffib;

@@ -677,9 +641,7 @@ self: super: {
mkdir -p $data/share/emacs
ln -s $lispdir $data/share/emacs/site-lisp
'';
})).override {
haskell-src-exts = self.haskell-src-exts_1_19_1;
};
}));

# Make elisp files available at a location where people expect it.
hindent = (overrideCabal super.hindent (drv: {
@@ -691,9 +653,7 @@ self: super: {
ln -s $lispdir $data/share/emacs/site-lisp
'';
doCheck = false; # https://github.com/chrisdone/hindent/issues/299
})).override {
haskell-src-exts = self.haskell-src-exts_1_19_1;
};
}));

# https://github.com/bos/configurator/issues/22
configurator = dontCheck super.configurator;
@@ -945,9 +905,6 @@ self: super: {
# missing dependencies: doctest ==0.12.*
html-entities = doJailbreak super.html-entities;

# Needs a version that's newer than what we have in lts-9.
sbv = super.sbv.override { doctest = self.doctest_0_13_0; };

# https://github.com/takano-akio/filelock/issues/5
filelock = dontCheck super.filelock;

@@ -976,20 +933,10 @@ self: super: {
# test suite requires git and does a bunch of git operations
restless-git = dontCheck super.restless-git;

# This tool needs the latest hackage-db version. Using the latest version of
# optparse-applicative allows us to generate completions for fish and zsh.
cabal2nix = super.cabal2nix.overrideScope (self: super: {
hackage-db = self.hackage-db_2_0;
optparse-applicative = self.optparse-applicative_0_14_0_0;
});

# Depends on broken fluid.
fluid-idl-http-client = markBroken super.fluid-idl-http-client;
fluid-idl-scotty = markBroken super.fluid-idl-scotty;

# depends on amqp >= 0.17
amqp-utils = super.amqp-utils.override { amqp = dontCheck super.amqp_0_18_1; };

# Build with gi overloading feature disabled.
ltk = super.ltk.overrideScope (self: super: { haskell-gi-overloading = self.haskell-gi-overloading_0_0; });

@@ -1014,23 +961,39 @@ self: super: {
testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps];
});

# Newer hpack's needs newer HUnit, but we cannot easily override the version
# used in the build, so we take the easy way out and disable the test suite.
hpack_0_20_0 = dontCheck super.hpack_0_20_0;
hpack_0_21_2 = dontCheck super.hpack_0_21_2;

# Stack 1.6.1 needs newer versions than LTS-9 provides.
stack = super.stack.overrideScope (self: super: {
ansi-terminal = self.ansi-terminal_0_7_1_1;
ansi-wl-pprint = self.ansi-wl-pprint_0_6_8_1;
extra = dontCheck super.extra_1_6_2;
hpack = super.hpack_0_20_0;
path = dontCheck super.path_0_6_1;
path-io = self.path-io_1_3_3;
unliftio = self.unliftio_0_2_0_0;
});
# https://github.com/fpco/stackage/issues/3126
stack = doJailbreak super.stack;

# Hoogle needs a newer version than lts-9 provides.
# Hoogle needs a newer version than lts-10 provides.
hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_20_1; };

# These packages depend on each other, forming an infinte loop.
scalendar = markBroken super.scalendar;
SCalendar = markBroken super.SCalendar;

# Needs QuickCheck <2.10, which we don't have.
edit-distance = doJailbreak super.edit-distance;
blaze-markup = doJailbreak super.blaze-markup;
blaze-html = doJailbreak super.blaze-html;
attoparsec = dontCheck super.attoparsec; # 1 out of 67 tests fails
int-cast = doJailbreak super.int-cast;
nix-derivation = doJailbreak super.nix-derivation;
graphviz = doJailbreak super.graphviz;

# Needs tasty-quickcheck ==0.8.*, which we don't have.
cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
cryptohash-sha1 = doJailbreak super.cryptohash-sha1;
cryptohash-md5 = doJailbreak super.cryptohash-md5;
text-short = doJailbreak super.text-short;

# https://github.com/aisamanra/config-ini/issues/12
config-ini = dontCheck super.config-ini;

# doctest >=0.9 && <0.12
genvalidity-property = doJailbreak super.genvalidity-property;
path = dontCheck super.path;

# Duplicate instance with smallcheck.
store = dontCheck super.store;

}
7 changes: 0 additions & 7 deletions pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
View file
Original file line number Diff line number Diff line change
@@ -71,11 +71,4 @@ self: super: {
# https://github.com/aristidb/aws/issues/238
aws = doJailbreak super.aws;

# LTS-9 versions do not compile.
path = dontCheck super.path;
path-io = super.path-io_1_3_3;
trifecta = super.trifecta_1_7_1_1;
aeson-compat = dontCheck super.aeson-compat_0_3_7_1; # test suite needs QuickCheck 2.10.*
binary-orphans = dontCheck super.binary-orphans_0_1_8_0; # test suite needs QuickCheck 2.10.*

}
Loading