git.iko.soy/typeable/nixpkgs
on master help sign in
haskell-modules: update configuration-common.nix
commit5791d8e600e46f0f72c6dea3ffa1edfcdca3277f authorYorick van Pelt <yorick@yorickvanpelt.nl> dateMon 2 Sep 2019, 15:19 (7 years ago) parent67588cd
2 files changed+7−80
pkgs/development/haskell-modules/configuration-common.nix+7−77 pkgs/development/haskell-modules/configuration-hackage2nix.yaml−3
pkgs/development/haskell-modules/configuration-common.nix+7−77
@@ -985,25 +985,17 @@ self: super: {
985985 '';
986986 });
987987
988− # https://github.com/haskell-rewriting/term-rewriting/issues/11
989− term-rewriting = dontCheck (doJailbreak super.term-rewriting);
988+ # https://github.com/haskell-rewriting/term-rewriting/pull/15
989+ # remove on next hackage update
990+ term-rewriting = doJailbreak super.term-rewriting;
990991
991− # https://github.com/nick8325/twee/pull/1
992− twee-lib = dontHaddock super.twee-lib;
993−
994− # Needs older hlint
995− hpio = dontCheck super.hpio;
996−
997− # https://github.com/fpco/inline-c/issues/72
998− inline-c = dontCheck super.inline-c;
999−
1000− # https://github.com/GaloisInc/pure-zlib/issues/6
992+ # https://github.com/GaloisInc/pure-zlib/pull/11
1001993 pure-zlib = doJailbreak super.pure-zlib;
1002994
1003− # https://github.com/strake/lenz-template.hs/issues/1
995+ # https://github.com/strake/lenz-template.hs/pull/2
1004996 lenz-template = doJailbreak super.lenz-template;
1005997
1006− # https://github.com/haskell-hvr/resolv/issues/1
998+ # https://github.com/haskell-hvr/resolv/pull/6
1007999 resolv = dontCheck super.resolv;
10081000 resolv_0_1_1_2 = dontCheck super.resolv_0_1_1_2;
10091001
@@ -1016,11 +1008,6 @@ self: super: {
10161008 testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
10171009 preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"'';
10181010 });
1019− arbtt = overrideCabal super.arbtt (drv: {
1020− preCheck = ''
1021− for n in $PWD/dist/build/*; do PATH+=":$n"; done
1022− '';
1023− });
10241011
10251012 # This package refers to the wrong library (itself in fact!)
10261013 vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
@@ -1031,14 +1018,11 @@ self: super: {
10311018 # };
10321019
10331020 # https://github.com/dmwit/encoding/pull/3
1034− encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch;
1021+ encoding = doJailbreak (appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch);
10351022
10361023 # Work around overspecified constraint on github ==0.18.
10371024 github-backup = doJailbreak super.github-backup;
10381025
1039− # https://github.com/fpco/streaming-commons/issues/49
1040− streaming-commons = dontCheck super.streaming-commons;
1041−
10421026 # Test suite depends on old QuickCheck 2.10.x.
10431027 cassava = dontCheck super.cassava;
10441028
@@ -1069,16 +1053,9 @@ self: super: {
10691053 super.dhall-nix
10701054 );
10711055
1072− # https://github.com/well-typed/cborg/issues/174
1073− cborg = doJailbreak super.cborg;
1074− serialise = doJailbreak (dontCheck super.serialise);
1075−
10761056 # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558
10771057 netrc = doJailbreak super.netrc;
10781058
1079− # https://github.com/phadej/tree-diff/issues/19
1080− tree-diff = doJailbreak super.tree-diff;
1081−
10821059 # https://github.com/haskell-hvr/hgettext/issues/14
10831060 hgettext = doJailbreak super.hgettext;
10841061
@@ -1089,23 +1066,6 @@ self: super: {
10891066 haddock-library = doJailbreak (dontCheck super.haddock-library);
10901067 # haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
10911068
1092− # haskell-names-0.9.4: Break out of “tasty >=0.12 && <1.2”
1093− haskell-names = doJailbreak super.haskell-names;
1094−
1095− # hdocs-0.5.3.1: Break out of “haddock-api ==2.21.*”
1096− # cannot use doJailbreak due to https://github.com/peti/jailbreak-cabal/issues/7
1097− hdocs = overrideCabal super.hdocs (drv: {
1098− postPatch = ''
1099− sed -i 's#haddock-api == 2\.21\.\*,#haddock-api == 2.22.*,#' hdocs.cabal
1100− '';
1101− });
1102−
1103− # Break out of tasty >=0.10 && <1.2.
1104− aeson-compat = doJailbreak super.aeson-compat;
1105−
1106− # Break out of pretty-show >=1.6 && <1.9
1107− hedgehog = doJailbreak super.hedgehog;
1108−
11091069 # Generate shell completion.
11101070 cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
11111071 stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: {
@@ -1146,22 +1106,6 @@ self: super: {
11461106 # Generate shell completions
11471107 purescript = generateOptparseApplicativeCompletion "purs" super.purescript;
11481108
1149− # https://github.com/adinapoli/mandrill/pull/52
1150− mandrill = appendPatch super.mandrill (pkgs.fetchpatch {
1151− url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch;
1152− sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv";
1153− });
1154−
1155− # https://github.com/Euterpea/Euterpea2/pull/22
1156− Euterpea = overrideSrc super.Euterpea {
1157− src = pkgs.fetchFromGitHub {
1158− owner = "Euterpea";
1159− repo = "Euterpea2";
1160− rev = "6f49b790adfb8b65d95a758116c20098fb0cd34c";
1161− sha256 = "0qz1svb96n42nmig16vyphwxas34hypgayvwc91ri7w7xd6yi1ba";
1162− };
1163− };
1164−
11651109 # https://github.com/kcsongor/generic-lens/pull/65
11661110 generic-lens = dontCheck super.generic-lens;
11671111
@@ -1186,7 +1130,6 @@ self: super: {
11861130
11871131 # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30
11881132 tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1
1189− these = doJailbreak super.these; # until these >= 0.7.6
11901133
11911134 uri-bytestring = appendPatch super.uri-bytestring (pkgs.fetchpatch {
11921135 url = "https://github.com/Soostone/uri-bytestring/commit/e5c5602a97160a6a6304a24947e33e47c9155460.patch";
@@ -1198,13 +1141,6 @@ self: super: {
11981141 testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql];
11991142 });
12001143
1201− # https://github.com/sighingnow/computations/pull/1
1202− primesieve = appendPatch super.primesieve (pkgs.fetchpatch {
1203− url = "https://github.com/sighingnow/computations/commit/1f96788367c879b999afe733e2fe28d919d17702.patch";
1204− sha256 = "0lrcmcrxp9imj9rfaq7mb0fn9mxms4gq4sz95n4san3dpd0qmj9x";
1205− stripLen = 1;
1206− });
1207−
12081144 # Fix for base >= 4.11
12091145 scat = overrideCabal super.scat (drv: {
12101146 patches = [(pkgs.fetchpatch {
@@ -1239,9 +1175,6 @@ self: super: {
12391175 # Fix build with attr-2.4.48 (see #53716)
12401176 xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;
12411177
1242− # Break out of pandoc >=2.0 && <2.7 (https://github.com/pbrisbin/yesod-markdown/pull/65)
1243− yesod-markdown = doJailbreak super.yesod-markdown;
1244−
12451178 # These packages needs network 3.x, which is not in LTS-13.x.
12461179 network-bsd_2_8_1_0 = super.network-bsd_2_8_1_0.override { network = self.network_3_0_1_1; };
12471180 lambdabot-core = super.lambdabot-core.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; });
@@ -1270,9 +1203,6 @@ self: super: {
12701203 # https://github.com/pruvisto/heap/issues/11
12711204 heap = dontCheck super.heap;
12721205
1273− # https://github.com/hslua/tasty-lua/issues/1
1274− tasty-lua = dontCheck super.tasty-lua;
1275−
12761206 # Test suite won't link for no apparent reason.
12771207 constraints-deriving = dontCheck super.constraints-deriving;
12781208
pkgs/development/haskell-modules/configuration-hackage2nix.yaml−3
@@ -4547,7 +4547,6 @@ broken-packages:
45474547 - Empty
45484548 - empty-monad
45494549 - enchant
4550− - encoding
45514550 - encoding-io
45524551 - engine-io-growler
45534552 - engine-io-snap
@@ -4619,7 +4618,6 @@ broken-packages:
46194618 - euler-tour-tree
46204619 - euphoria
46214620 - eurofxref
4622− - Euterpea
46234621 - eve
46244622 - eve-cli
46254623 - event
@@ -10204,7 +10202,6 @@ broken-packages:
1020410202 - xkcd
1020510203 - xleb
1020610204 - xlsior
10207− - xlsx
1020810205 - xlsx-tabular
1020910206 - xlsx-templater
1021010207 - xml-catalog