Merge remote-tracking branch 'upstream/master' into HEAD

Conflicts:
	pkgs/os-specific/linux/kernel/generic.nix
This commit is contained in:
Tuomas Tynkkynen
2018-02-07 03:41:24 +02:00
49 changed files with 1909 additions and 268 deletions

View File

@@ -1,14 +1,14 @@
{ stdenv, cmake, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "33";
version = "42";
rev = "version_${version}";
name = "binaryen-${version}";
src = fetchFromGitHub {
owner = "WebAssembly";
repo = "binaryen";
sha256 = "0zijs2mcgfv0iynwdb0l4zykm0891b1zccf6r8w35ipxvcdwbsbp";
sha256 = "0b8qc9cd7ncshgfjwv4hfapmwa81gmniaycnxmdkihq9bpm26x2k";
inherit rev;
};

View File

@@ -43,7 +43,861 @@ self: super: {
xhtml = null;
# GHC 8.4.x needs newer versions than LTS-10.x offers by default.
hspec = dontCheck super.hspec_2_4_7; # test suite causes an infinite loop
test-framework = self.test-framework_0_8_2_0;
## haddock: panic! (the 'impossible' happened)
## (GHC version 8.4.20180122 for x86_64-unknown-linux):
## extractDecl
## Ambiguous decl for Arg in class:
## class Example e where
## type Arg e :: *
## {-# MINIMAL evaluateExample #-}
## evaluateExample ::
## e
## -> Params
## -> ActionWith Arg e -> IO () -> ProgressCallback -> IO Result
## Matches:
## []
## Call stack:
## CallStack (from HasCallStack):
## callStackDoc, called at compiler/utils/Outputable.hs:1150:37 in ghc:Outputable
## pprPanic, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1013:16 in main:Haddock.Interface.Create
## Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug
hspec = dontHaddock (dontCheck super.hspec_2_4_7); # test suite causes an infinite loop
## Setup: Encountered missing dependencies:
## QuickCheck >=2.3 && <2.10
## builder for /nix/store/d60y5jwn5bpgk2p8ps23c129dcw7whg6-test-framework-0.8.2.0.drv failed with exit code 1
## error: build of /nix/store/d60y5jwn5bpgk2p8ps23c129dcw7whg6-test-framework-0.8.2.0.drv failed
test-framework = dontCheck self.test-framework_0_8_2_0;
# Undo the override in `configuration-common.nix`: GHC 8.4 bumps Cabal to 2.1:
# Distribution/Simple/CCompiler.hs:64:10: error:
# • No instance for (Semigroup CDialect)
# arising from the superclasses of an instance declaration
# • In the instance declaration for Monoid CDialect
# |
# 64 | instance Monoid CDialect where
# | ^^^^^^^^^^^^^^^
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal; }; #pkgs.haskell.packages.ghc822.jailbreak-cabal;
## Shadowed:
## Needs bump to a versioned attribute
##
## • Could not deduce (Semigroup (Dict a))
## arising from the superclasses of an instance declaration
## from the context: a
constraints = super.constraints_0_10;
hspec-core = overrideCabal super.hspec-core_2_4_7 (drv: {
## Needs bump to a versioned attribute
##
## • No instance for (Semigroup Summary)
## arising from the superclasses of an instance declaration
## • In the instance declaration for Monoid Summary
doCheck = false;
});
## Needs bump to a versioned attribute
##
## breaks hspec:
## Setup: Encountered missing dependencies:
## hspec-discover ==2.4.7
hspec-discover = super.hspec-discover_2_4_7;
## Needs bump to a versioned attribute
##
## • No instance for (Semigroup Metadatas)
## arising from the superclasses of an instance declaration
## • In the instance declaration for Monoid Metadatas
JuicyPixels = super.JuicyPixels_3_2_9_4;
## Needs bump to a versioned attribute
##
## • Could not deduce (Semigroup (a :->: b))
## arising from the superclasses of an instance declaration
## from the context: (HasTrie a, Monoid b)
MemoTrie = super.MemoTrie_0_6_9;
semigroupoids = overrideCabal super.semigroupoids_5_2_2 (drv: {
## Needs bump to a versioned attribute
##
## • Variable not in scope: mappend :: Seq a -> Seq a -> Seq a
## CABAL-MISSING-DEPS
## Setup: Encountered missing dependencies:
## ghc >=7.0 && <8.4
## builder for /nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv failed with exit code 1
## error: build of /nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv failed
doCheck = false;
});
## Needs bump to a versioned attribute
##
## • Could not deduce (Semigroup (Traversal f))
## arising from the superclasses of an instance declaration
## from the context: Applicative f
tasty = super.tasty_1_0_0_1;
## Needs bump to a versioned attribute
##
## Setup: Encountered missing dependencies:
## template-haskell >=2.4 && <2.13
## builder for /nix/store/sq6cc33h4zk1wns2fsyv8cj6clcf6hwi-th-lift-0.7.7.drv failed with exit code 1
## error: build of /nix/store/sq6cc33h4zk1wns2fsyv8cj6clcf6hwi-th-lift-0.7.7.drv failed
th-lift = super.th-lift_0_7_8;
## On Hackage:
happy = overrideCabal super.happy (drv: {
## On Hackage, awaiting for import
##
## Ambiguous occurrence <>
## It could refer to either Prelude.<>,
## imported from Prelude at src/PrettyGrammar.hs:1:8-20
version = "1.19.9";
sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y";
});
## Upstreamed
free = overrideCabal super.free (drv: {
## Upstreamed, awaiting a Hackage release
##
## • Could not deduce (Semigroup (IterT m a))
## arising from the superclasses of an instance declaration
## from the context: (Monad m, Monoid a)
src = pkgs.fetchFromGitHub {
owner = "ekmett";
repo = "free";
rev = "fcefc71ed302f2eaf60f020046bad392338b3109";
sha256 = "0mfrd7y97pgqmb2i66jn5xwjpcrgnfcqq8dzkxqgx1b5wjdydq70";
};
## Setup: Encountered missing dependencies:
## transformers-base <0.5
## builder for /nix/store/3yvaqx5qcg1fb3nnyc273fkhgfh73pgv-free-4.12.4.drv failed with exit code 1
## error: build of /nix/store/3yvaqx5qcg1fb3nnyc273fkhgfh73pgv-free-4.12.4.drv failed
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.transformers-base ];
});
haskell-gi = overrideCabal super.haskell-gi (drv: {
## Upstreamed, awaiting a Hackage release
##
## Setup: Encountered missing dependencies:
## haskell-gi-base ==0.20.*
## builder for /nix/store/q0qkq2gzmdnkvdz6xl7svv5305chbr4b-haskell-gi-0.20.3.drv failed with exit code 1
## error: build of /nix/store/q0qkq2gzmdnkvdz6xl7svv5305chbr4b-haskell-gi-0.20.3.drv failed
src = pkgs.fetchFromGitHub {
owner = "haskell-gi";
repo = "haskell-gi";
rev = "30d2e6415c5b57760f8754cd3003eb07483d60e6";
sha256 = "1l3qm97gcjih695hhj80rbpnd72prnc81lg5y373yj8jk9f6ypbr";
};
## CABAL-MISSING-DEPS
## Setup: Encountered missing dependencies:
## ghc >=7.0 && <8.4
## builder for /nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv failed with exit code 1
## error: build of /nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv failed
doCheck = false;
});
haskell-gi-base = overrideCabal super.haskell-gi-base (drv: {
## Upstreamed, awaiting a Hackage release
##
## breaks haskell-gi:
## Setup: Encountered missing dependencies:
## haskell-gi-base ==0.21.*
src = pkgs.fetchFromGitHub {
owner = "haskell-gi";
repo = "haskell-gi";
rev = "30d2e6415c5b57760f8754cd3003eb07483d60e6";
sha256 = "1l3qm97gcjih695hhj80rbpnd72prnc81lg5y373yj8jk9f6ypbr";
};
## Setup: Encountered missing dependencies:
## attoparsec ==0.13.*,
## doctest >=0.8,
## haskell-gi-base ==0.21.*,
## pretty-show -any,
## regex-tdfa >=1.2,
prePatch = "cd base; ";
});
haskell-src-exts = overrideCabal super.haskell-src-exts (drv: {
## Upstreamed, awaiting a Hackage release
##
## • Could not deduce (Semigroup (ParseResult m))
## arising from the superclasses of an instance declaration
## from the context: Monoid m
src = pkgs.fetchFromGitHub {
owner = "haskell-suite";
repo = "haskell-src-exts";
rev = "935f6f0915e89c314b686bdbdc6980c72335ba3c";
sha256 = "1v3c1bd5q07qncqfbikvs8h3r4dr500blm5xv3b4jqqv69f0iam9";
};
});
hedgehog = overrideCabal super.hedgehog (drv: {
## Upstreamed, awaiting a Hackage release
##
## /nix/store/78sxg2kvl2klplqfx22s6b42lds7qq23-stdenv/setup: line 99: cd: hedgehog: No such file or directory
src = pkgs.fetchFromGitHub {
owner = "hedgehogqa";
repo = "haskell-hedgehog";
rev = "7a4fab73670bc33838f2b5f25eb824ee550079ce";
sha256 = "1l8maassmklf6wgairk7llxvlbwxngv0dzx0fwnqx6hsb32sms05";
};
## jailbreak-cabal: dieVerbatim: user error (jailbreak-cabal: Error Parsing: file "hedgehog.cabal" doesn't exist. Cannot
prePatch = "cd hedgehog; ";
});
lambdacube-compiler = overrideCabal super.lambdacube-compiler (drv: {
## Upstreamed, awaiting a Hackage release
##
## Setup: Encountered missing dependencies:
## aeson >=0.9 && <0.12,
## base >=4.7 && <4.10,
## directory ==1.2.*,
## megaparsec ==5.0.*,
## vector ==0.11.*
src = pkgs.fetchFromGitHub {
owner = "lambdacube3d";
repo = "lambdacube-compiler";
rev = "ff6e3b136eede172f20ea8a0f7017ad1ecd029b8";
sha256 = "0srzrq5s7pdbygn7vdipxl12a3gbyb6bpa7frbh8zwhb9fz0jx5m";
};
});
lambdacube-ir = overrideCabal super.lambdacube-ir (drv: {
## Upstreamed, awaiting a Hackage release
##
## /nix/store/78sxg2kvl2klplqfx22s6b42lds7qq23-stdenv/setup: line 99: cd: lambdacube-ir.haskell: No such file or directory
src = pkgs.fetchFromGitHub {
owner = "lambdacube3d";
repo = "lambdacube-ir";
rev = "b86318b510ef59606c5b7c882cad33af52ce257c";
sha256 = "0j4r6b32lcm6jg653xzg9ijxkfjahlb4x026mv5dhs18kvgqhr8x";
};
## Setup: No cabal file found.
prePatch = "cd lambdacube-ir.haskell; ";
});
lens = overrideCabal super.lens (drv: {
## Upstreamed, awaiting a Hackage release
##
## • Could not deduce (Apply f)
## arising from the superclasses of an instance declaration
## from the context: (Contravariant f, Applicative f)
src = pkgs.fetchFromGitHub {
owner = "ekmett";
repo = "lens";
rev = "4ad49eaf2448d856f0433fe5a4232f1e8fa87eb0";
sha256 = "0sd08v6syadplhk5d21yi7qffbjncn8z1bqlwz9nyyb0xja8s8wa";
};
## CABAL-MISSING-DEPS
## Setup: Encountered missing dependencies:
## ghc >=7.0 && <8.4
## builder for /nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv failed with exit code 1
## error: build of /nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv failed
doCheck = false;
## Setup: Encountered missing dependencies:
## template-haskell >=2.4 && <2.13
## builder for /nix/store/fvrc4s96ym33i74y794nap7xai9p69fa-lens-4.15.4.drv failed with exit code 1
## error: build of /nix/store/fvrc4s96ym33i74y794nap7xai9p69fa-lens-4.15.4.drv failed
jailbreak = true;
});
simple-reflect = overrideCabal super.simple-reflect (drv: {
## Upstreamed, awaiting a Hackage release
##
## • No instance for (Semigroup Expr)
## arising from the superclasses of an instance declaration
## • In the instance declaration for Monoid Expr
src = pkgs.fetchFromGitHub {
owner = "twanvl";
repo = "simple-reflect";
rev = "c357e55da9a712dc5dbbfe6e36394e4ada2db310";
sha256 = "15q41b00l8y51xzhbj5zhddyh3gi7gvml033w8mm2fih458jf6yq";
};
});
singletons = overrideCabal super.singletons (drv: {
## Upstreamed, awaiting a Hackage release
##
## Setup: Encountered missing dependencies:
## th-desugar ==1.7.*
## builder for /nix/store/g5jl22kpq8fnrg8ldphxndri759nxwzf-singletons-2.3.1.drv failed with exit code 1
## error: build of /nix/store/g5jl22kpq8fnrg8ldphxndri759nxwzf-singletons-2.3.1.drv failed
src = pkgs.fetchFromGitHub {
owner = "goldfirere";
repo = "singletons";
rev = "23aa4bdaf05ce025a2493b35ec3c26cc94e3fdce";
sha256 = "0hw12v4z8jxmykc3j8z6g27swmfpxv40bgnx7nl0ialpwbz9mz27";
};
});
stringbuilder = overrideCabal super.stringbuilder (drv: {
## Upstreamed, awaiting a Hackage release
##
## • No instance for (Semigroup Builder)
## arising from the superclasses of an instance declaration
## • In the instance declaration for Monoid Builder
src = pkgs.fetchFromGitHub {
owner = "sol";
repo = "stringbuilder";
rev = "4a1b689d3c8a462b28e0d21224b96165f622e6f7";
sha256 = "0h3nva4mwxkdg7hh7b7a3v561wi1bvmj0pshhd3sl7dy3lpvnrah";
};
});
th-desugar = overrideCabal super.th-desugar (drv: {
## Upstreamed, awaiting a Hackage release
##
## • Could not deduce (MonadIO (DsM q))
## arising from the 'deriving' clause of a data type declaration
## from the context: Quasi q
src = pkgs.fetchFromGitHub {
owner = "goldfirere";
repo = "th-desugar";
rev = "4ca98c6492015e6ad063d3ad1a2ad6c4f0a56837";
sha256 = "1n3myd3gia9qsgdvrwqa023d3g7wkrhyv0wc8czwzz0lj9xzh7lw";
};
});
unordered-containers = overrideCabal super.unordered-containers (drv: {
## Upstreamed, awaiting a Hackage release
##
## Module Data.Semigroup does not export Monoid(..)
## |
## 80 | import Data.Semigroup (Semigroup(..), Monoid(..))
src = pkgs.fetchFromGitHub {
owner = "tibbe";
repo = "unordered-containers";
rev = "0a6b84ec103e28b73458f385ef846a7e2d3ea42f";
sha256 = "128q8k4py2wr1v0gmyvqvzikk6sksl9aqj0lxzf46763lis8x9my";
};
});
websockets = overrideCabal super.websockets (drv: {
## Upstreamed, awaiting a Hackage release
##
## • No instance for (Semigroup SizeLimit)
## arising from the superclasses of an instance declaration
## • In the instance declaration for Monoid SizeLimit
src = pkgs.fetchFromGitHub {
owner = "jaspervdj";
repo = "websockets";
rev = "11ba6d15cf47bace1936b13a58192e37908b0300";
sha256 = "1swphhnqvs5kh0wlqpjjgx9q91yxi6lasid8akdxp3gqll5ii2hf";
};
});
## Unmerged
blaze-builder = overrideCabal super.blaze-builder (drv: {
## Unmerged. PR: https://github.com/lpsmith/blaze-builder/pull/10
##
## • No instance for (Semigroup Poke)
## arising from the superclasses of an instance declaration
## • In the instance declaration for Monoid Poke
src = pkgs.fetchFromGitHub {
owner = "bgamari";
repo = "blaze-builder";
rev = "b7195f160795a081adbb9013810d843f1ba5e062";
sha256 = "1g351fdpsvn2lbqiy9bg2s0wwrdccb8q1zh7gvpsx5nnj24b1c00";
};
});
bytestring-trie = overrideCabal super.bytestring-trie (drv: {
## Unmerged. PR: https://github.com/wrengr/bytestring-trie/pull/3
##
## • Could not deduce (Semigroup (Trie a))
## arising from the superclasses of an instance declaration
## from the context: Monoid a
src = pkgs.fetchFromGitHub {
owner = "RyanGlScott";
repo = "bytestring-trie";
rev = "e0ae0cb1ad40dedd560090d69cc36f9760797e29";
sha256 = "1jkdchvrca7dgpij5k4h1dy4qr1rli3fzbsqajwxmx9865rgiksl";
};
## Setup: Encountered missing dependencies:
## HUnit >=1.3.1.1 && <1.7,
## QuickCheck >=2.4.1 && <2.11,
## lazysmallcheck ==0.6.*,
## smallcheck >=1.1.1 && <1.2
doCheck = false;
## Setup: Encountered missing dependencies:
## data-or ==1.0.*
## builder for /nix/store/iw3xsljnygsv9q2jglcv54mqd94fig7n-bytestring-trie-0.2.4.1.drv failed with exit code 1
## error: build of /nix/store/iw3xsljnygsv9q2jglcv54mqd94fig7n-bytestring-trie-0.2.4.1.drv failed
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.data-or ];
});
gtk2hs-buildtools = overrideCabal super.gtk2hs-buildtools (drv: {
## Unmerged. PR: https://github.com/gtk2hs/gtk2hs/pull/233
##
## /nix/store/78sxg2kvl2klplqfx22s6b42lds7qq23-stdenv/setup: line 99: cd: tools: No such file or directory
src = pkgs.fetchFromGitHub {
owner = "deepfire";
repo = "gtk2hs";
rev = "08c68d5afc22dd5761ec2c92ebf49c6d252e545b";
sha256 = "06prn5wqq8x225n9wlbyk60f50jyjj8fm2hf181dyqjpf8wq75xa";
};
## Setup: No cabal file found.
prePatch = "cd tools; ";
});
hashtables = overrideCabal super.hashtables (drv: {
## Unmerged. PR: https://github.com/gregorycollins/hashtables/pull/46
##
## • No instance for (Semigroup Slot)
## arising from the superclasses of an instance declaration
## • In the instance declaration for Monoid Slot
src = pkgs.fetchFromGitHub {
owner = "deepfire";
repo = "hashtables";
rev = "b9eb4b10a50bd6250330422afecc065339a32412";
sha256 = "0l4nplpvnzzf397zyh7j2k6yiqb46k6bdy00m4zzvhlfp7p1xkaw";
};
});
language-c = overrideCabal super.language-c (drv: {
## Unmerged. PR: https://github.com/visq/language-c/pull/45
##
## Ambiguous occurrence <>
## It could refer to either Prelude.<>,
## imported from Prelude at src/Language/C/Pretty.hs:15:8-24
src = pkgs.fetchFromGitHub {
owner = "deepfire";
repo = "language-c";
rev = "03b120c64c12946d134017f4922b55c6ab4f52f8";
sha256 = "1mcv46fq37kkd20rhhdbn837han5knjdsgc7ckqp5r2r9m3vy89r";
};
## /bin/sh: cabal: command not found
doCheck = false;
});
language-c_0_7_0 = overrideCabal super.language-c_0_7_0 (drv: {
## Unmerged. PR: https://github.com/visq/language-c/pull/45
##
## Ambiguous occurrence <>
## It could refer to either Prelude.<>,
## imported from Prelude at src/Language/C/Pretty.hs:15:8-24
src = pkgs.fetchFromGitHub {
owner = "deepfire";
repo = "language-c";
rev = "03b120c64c12946d134017f4922b55c6ab4f52f8";
sha256 = "1mcv46fq37kkd20rhhdbn837han5knjdsgc7ckqp5r2r9m3vy89r";
};
## /bin/sh: cabal: command not found
doCheck = false;
});
monadplus = overrideCabal super.monadplus (drv: {
## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3
##
## • No instance for (Semigroup (Partial a b))
## arising from the superclasses of an instance declaration
## • In the instance declaration for Monoid (Partial a b)
src = pkgs.fetchFromGitHub {
owner = "asr";
repo = "monadplus";
rev = "aa09f2473e2c906f2707b8a3fdb0a087405fd6fb";
sha256 = "0g37s3rih4i3vrn4kjwj12nq5lkpckmjw33xviva9gly2vg6p3xc";
};
});
reflex = overrideCabal super.reflex (drv: {
## Unmerged. PR: https://github.com/reflex-frp/reflex/pull/158
##
## • Could not deduce (Semigroup (Event t a))
## arising from the superclasses of an instance declaration
## from the context: (Semigroup a, Reflex t)
src = pkgs.fetchFromGitHub {
owner = "deepfire";
repo = "reflex";
rev = "4fb50139db45a37493b91973eeaad9885b4c63ca";
sha256 = "0i7pp6cw394m2vbwcqv9z5ngdarp01sabqr1jkkgchxdkkii94nx";
};
## mergeIncrementalWithMove ::
## GCompare k =>
## Incremental t (PatchDMapWithMove k (Event t))
## -> Event t (DMap k Identity)
## currentIncremental ::
## Patch p => Incremental t p -> Behavior t (PatchTarget p)
## updatedIncremental :: Patch p => Incremental t p -> Event t p
## incrementalToDynamic ::
## Patch p => Incremental t p -> Dynamic t (PatchTarget p)
## behaviorCoercion ::
## Coercion a b -> Coercion (Behavior t a) (Behavior t b)
## eventCoercion :: Coercion a b -> Coercion (Event t a) (Event t b)
## dynamicCoercion ::
## Coercion a b -> Coercion (Dynamic t a) (Dynamic t b)
## mergeIntIncremental ::
## Incremental t (PatchIntMap (Event t a)) -> Event t (IntMap a)
## fanInt :: Event t (IntMap a) -> EventSelectorInt t a
## {-# MINIMAL never, constant, push, pushCheap, pull, merge, fan,
## switch, coincidence, current, updated, unsafeBuildDynamic,
## unsafeBuildIncremental, mergeIncremental, mergeIncrementalWithMove,
## currentIncremental, updatedIncremental, incrementalToDynamic,
## behaviorCoercion, eventCoercion, dynamicCoercion,
## mergeIntIncremental, fanInt #-}
## Matches:
## []
## Call stack:
## CallStack (from HasCallStack):
## callStackDoc, called at compiler/utils/Outputable.hs:1150:37 in ghc:Outputable
## pprPanic, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1013:16 in main:Haddock.Interface.Create
## Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug
doHaddock = false;
## Setup: Encountered missing dependencies:
## base >=4.7 && <4.11, bifunctors >=5.2 && <5.5
## builder for /nix/store/93ka24600m4mipsgn2cq8fwk124q97ca-reflex-0.4.0.1.drv failed with exit code 1
## error: build of /nix/store/93ka24600m4mipsgn2cq8fwk124q97ca-reflex-0.4.0.1.drv failed
jailbreak = true;
## Setup: Encountered missing dependencies:
## data-default -any,
## lens -any,
## monad-control -any,
## prim-uniq -any,
## reflection -any,
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.data-default self.haskell-src-exts self.lens self.monad-control self.prim-uniq self.reflection self.split self.template-haskell self.unbounded-delays ];
});
regex-tdfa = overrideCabal super.regex-tdfa (drv: {
## Unmerged. PR: https://github.com/ChrisKuklewicz/regex-tdfa/pull/13
##
## • No instance for (Semigroup (CharMap a))
## arising from the superclasses of an instance declaration
## • In the instance declaration for Monoid (CharMap a)
src = pkgs.fetchFromGitHub {
owner = "bgamari";
repo = "regex-tdfa";
rev = "34f4593a520176a917b74b8c7fcbbfbd72fb8178";
sha256 = "1aiklvf08w1hx2jn9n3sm61mfvdx4fkabszkjliapih2yjpmi3hq";
};
});
text-format = overrideCabal super.text-format (drv: {
## Unmerged. PR: https://github.com/bos/text-format/pull/21
##
## • No instance for (Semigroup Format)
## arising from the superclasses of an instance declaration
## • In the instance declaration for Monoid Format
src = pkgs.fetchFromGitHub {
owner = "deepfire";
repo = "text-format";
rev = "a1cda87c222d422816f956c7272e752ea12dbe19";
sha256 = "0lyrx4l57v15rvazrmw0nfka9iyxs4wyaasjj9y1525va9s1z4fr";
};
});
wl-pprint-text = overrideCabal super.wl-pprint-text (drv: {
## Unmerged. PR: https://github.com/ivan-m/wl-pprint-text/pull/17
##
## Ambiguous occurrence <>
## It could refer to either PP.<>,
## imported from Prelude.Compat at Text/PrettyPrint/Leijen/Text/Monadic.hs:73:1-36
src = pkgs.fetchFromGitHub {
owner = "deepfire";
repo = "wl-pprint-text";
rev = "615b83d1e5be52d1448aa1ab2517b431a617027b";
sha256 = "1p67v9s878br0r152h4n37smqhkg78v8zxhf4qm6d035s4rzj76i";
};
});
## Non-code, configuration-only change
adjunctions = overrideCabal super.adjunctions (drv: {
## Setup: Encountered missing dependencies:
## free ==4.*
## builder for /nix/store/64pvqslahgby4jlg9rpz29n8w4njb670-adjunctions-4.3.drv failed with exit code 1
## error: build of /nix/store/64pvqslahgby4jlg9rpz29n8w4njb670-adjunctions-4.3.drv failed
jailbreak = true;
});
async = overrideCabal super.async (drv: {
## Setup: Encountered missing dependencies:
## base >=4.3 && <4.11
## builder for /nix/store/2xf491hgsmckz2akrn765kvvy2k8crbd-async-2.1.1.1.drv failed with exit code 1
## error: build of /nix/store/2xf491hgsmckz2akrn765kvvy2k8crbd-async-2.1.1.1.drv failed
jailbreak = true;
});
bifunctors = overrideCabal super.bifunctors (drv: {
## Setup: Encountered missing dependencies:
## template-haskell >=2.4 && <2.13
## builder for /nix/store/dy1hzdy14pz96cvx37yggbv6a88sgxq4-bifunctors-5.5.drv failed with exit code 1
## error: build of /nix/store/dy1hzdy14pz96cvx37yggbv6a88sgxq4-bifunctors-5.5.drv failed
jailbreak = true;
});
bindings-GLFW = overrideCabal super.bindings-GLFW (drv: {
## Setup: Encountered missing dependencies:
## template-haskell >=2.10 && <2.13
## builder for /nix/store/ykc786r2bby5kkbpqjg0y10wb9jhmsa9-bindings-GLFW-3.1.2.3.drv failed with exit code 1
## error: build of /nix/store/ykc786r2bby5kkbpqjg0y10wb9jhmsa9-bindings-GLFW-3.1.2.3.drv failed
jailbreak = true;
});
bytes = overrideCabal super.bytes (drv: {
## CABAL-MISSING-DEPS
## Setup: Encountered missing dependencies:
## ghc >=7.0 && <8.4
## builder for /nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv failed with exit code 1
## error: build of /nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv failed
doCheck = false;
});
cabal-doctest = overrideCabal super.cabal-doctest (drv: {
## Setup: Encountered missing dependencies:
## Cabal >=1.10 && <2.1, base >=4.3 && <4.11
## builder for /nix/store/zy3l0ll0r9dq29lgxajv12rz1jzjdkrn-cabal-doctest-1.0.5.drv failed with exit code 1
## error: build of /nix/store/zy3l0ll0r9dq29lgxajv12rz1jzjdkrn-cabal-doctest-1.0.5.drv failed
jailbreak = true;
});
ChasingBottoms = overrideCabal super.ChasingBottoms (drv: {
## Setup: Encountered missing dependencies:
## base >=4.2 && <4.11
## builder for /nix/store/wsyjjf4x6pmx84kxnjaka7zwakyrca03-ChasingBottoms-1.3.1.3.drv failed with exit code 1
## error: build of /nix/store/wsyjjf4x6pmx84kxnjaka7zwakyrca03-ChasingBottoms-1.3.1.3.drv failed
jailbreak = true;
});
comonad = overrideCabal super.comonad (drv: {
## CABAL-MISSING-DEPS
## Setup: Encountered missing dependencies:
## ghc >=7.0 && <8.4
## builder for /nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv failed with exit code 1
## error: build of /nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv failed
doCheck = false;
});
distributive = overrideCabal super.distributive (drv: {
## CABAL-MISSING-DEPS
## Setup: Encountered missing dependencies:
## ghc >=7.0 && <8.4
## builder for /nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv failed with exit code 1
## error: build of /nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv failed
doCheck = false;
});
exception-transformers = overrideCabal super.exception-transformers (drv: {
## Setup: Encountered missing dependencies:
## HUnit >=1.2 && <1.6
## builder for /nix/store/qs4g7lzq1ixcgg5rw4xb5545g7r34md8-exception-transformers-0.4.0.5.drv failed with exit code 1
## error: build of /nix/store/qs4g7lzq1ixcgg5rw4xb5545g7r34md8-exception-transformers-0.4.0.5.drv failed
jailbreak = true;
});
hashable = overrideCabal super.hashable (drv: {
## Setup: Encountered missing dependencies:
## base >=4.4 && <4.11
## builder for /nix/store/4qlxxypfhbwcv227cmsja1asgqnq37gf-hashable-1.2.6.1.drv failed with exit code 1
## error: build of /nix/store/4qlxxypfhbwcv227cmsja1asgqnq37gf-hashable-1.2.6.1.drv failed
jailbreak = true;
});
hashable-time = overrideCabal super.hashable-time (drv: {
## Setup: Encountered missing dependencies:
## base >=4.7 && <4.11
## builder for /nix/store/38dllcgxpmkd2fgvs6wd7ji86py0wbnh-hashable-time-0.2.0.1.drv failed with exit code 1
## error: build of /nix/store/38dllcgxpmkd2fgvs6wd7ji86py0wbnh-hashable-time-0.2.0.1.drv failed
jailbreak = true;
});
haskell-src-meta = overrideCabal super.haskell-src-meta (drv: {
## Setup: Encountered missing dependencies:
## base >=4.6 && <4.11, template-haskell >=2.8 && <2.13
## builder for /nix/store/g5wkb14sydvyv484agvaa7hxl84a0wr9-haskell-src-meta-0.8.0.2.drv failed with exit code 1
## error: build of /nix/store/g5wkb14sydvyv484agvaa7hxl84a0wr9-haskell-src-meta-0.8.0.2.drv failed
jailbreak = true;
});
hspec-meta = overrideCabal super.hspec-meta (drv: {
## Linking dist/build/hspec-meta-discover/hspec-meta-discover ...
## running tests
## Package has no test suites.
## haddockPhase
## Running hscolour for hspec-meta-2.4.6...
## Preprocessing library for hspec-meta-2.4.6..
## Preprocessing executable 'hspec-meta-discover' for hspec-meta-2.4.6..
## Preprocessing library for hspec-meta-2.4.6..
## Running Haddock on library for hspec-meta-2.4.6..
## Haddock coverage:
## haddock: panic! (the 'impossible' happened)
## (GHC version 8.4.20180122 for x86_64-unknown-linux):
## extractDecl
## Ambiguous decl for Arg in class:
## class Example e where
## type Arg e
## type Arg e = ()
## evaluateExample ::
## e
## -> Params
## -> (ActionWith (Arg e) -> IO ()) -> ProgressCallback -> IO Result
## {-# MINIMAL evaluateExample #-}
## Matches:
## []
## Call stack:
## CallStack (from HasCallStack):
## callStackDoc, called at compiler/utils/Outputable.hs:1150:37 in ghc:Outputable
## pprPanic, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1013:16 in main:Haddock.Interface.Create
## Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug
doHaddock = false;
});
integer-logarithms = overrideCabal super.integer-logarithms (drv: {
## Setup: Encountered missing dependencies:
## base >=4.3 && <4.11
## builder for /nix/store/zdiicv0jmjsw6bprs8wxxaq5m0z0a75f-integer-logarithms-1.0.2.drv failed with exit code 1
## error: build of /nix/store/zdiicv0jmjsw6bprs8wxxaq5m0z0a75f-integer-logarithms-1.0.2.drv failed
jailbreak = true;
});
kan-extensions = overrideCabal super.kan-extensions (drv: {
## Setup: Encountered missing dependencies:
## free ==4.*
## builder for /nix/store/kvnlcj6zdqi2d2yq988l784hswjwkk4c-kan-extensions-5.0.2.drv failed with exit code 1
## error: build of /nix/store/kvnlcj6zdqi2d2yq988l784hswjwkk4c-kan-extensions-5.0.2.drv failed
jailbreak = true;
});
keys = overrideCabal super.keys (drv: {
## Setup: Encountered missing dependencies:
## free ==4.*
## builder for /nix/store/khkbn7wmjr10nyq0wwkmn888bj1l4fmh-keys-3.11.drv failed with exit code 1
## error: build of /nix/store/khkbn7wmjr10nyq0wwkmn888bj1l4fmh-keys-3.11.drv failed
jailbreak = true;
});
lambdacube-gl = overrideCabal super.lambdacube-gl (drv: {
## Setup: Encountered missing dependencies:
## vector ==0.11.*
## builder for /nix/store/a98830jm4yywfg1d6264p4yngbiyvssp-lambdacube-gl-0.5.2.4.drv failed with exit code 1
## error: build of /nix/store/a98830jm4yywfg1d6264p4yngbiyvssp-lambdacube-gl-0.5.2.4.drv failed
jailbreak = true;
});
lifted-async = overrideCabal super.lifted-async (drv: {
## Setup: Encountered missing dependencies:
## base >=4.5 && <4.11
## builder for /nix/store/l3000vil24jyq66a5kfqvxfdmy7agwic-lifted-async-0.9.3.3.drv failed with exit code 1
## error: build of /nix/store/l3000vil24jyq66a5kfqvxfdmy7agwic-lifted-async-0.9.3.3.drv failed
jailbreak = true;
});
linear = overrideCabal super.linear (drv: {
## CABAL-MISSING-DEPS
## Setup: Encountered missing dependencies:
## ghc >=7.0 && <8.4
## builder for /nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv failed with exit code 1
## error: build of /nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv failed
doCheck = false;
});
newtype-generics = overrideCabal super.newtype-generics (drv: {
## Setup: Encountered missing dependencies:
## base >=4.6 && <4.11
## builder for /nix/store/l3rzsjbwys4rjrpv1703iv5zwbd4bwy6-newtype-generics-0.5.1.drv failed with exit code 1
## error: build of /nix/store/l3rzsjbwys4rjrpv1703iv5zwbd4bwy6-newtype-generics-0.5.1.drv failed
jailbreak = true;
});
parallel = overrideCabal super.parallel (drv: {
## Setup: Encountered missing dependencies:
## base >=4.3 && <4.11
## builder for /nix/store/c16gcgn7d7gql8bbjqngx7wbw907hnwb-parallel-3.2.1.1.drv failed with exit code 1
## error: build of /nix/store/c16gcgn7d7gql8bbjqngx7wbw907hnwb-parallel-3.2.1.1.drv failed
jailbreak = true;
});
quickcheck-instances = overrideCabal super.quickcheck-instances (drv: {
## Setup: Encountered missing dependencies:
## base >=4.5 && <4.11
## builder for /nix/store/r3fx9f7ksp41wfn6cp4id3mzgv04pwij-quickcheck-instances-0.3.16.1.drv failed with exit code 1
## error: build of /nix/store/r3fx9f7ksp41wfn6cp4id3mzgv04pwij-quickcheck-instances-0.3.16.1.drv failed
jailbreak = true;
});
tasty-ant-xml = overrideCabal super.tasty-ant-xml (drv: {
## Setup: Encountered missing dependencies:
## tasty >=0.10 && <1.0
## builder for /nix/store/86dlb96cdw9jpq95xbndf4axj1z542d6-tasty-ant-xml-1.1.2.drv failed with exit code 1
## error: build of /nix/store/86dlb96cdw9jpq95xbndf4axj1z542d6-tasty-ant-xml-1.1.2.drv failed
jailbreak = true;
});
tasty-expected-failure = overrideCabal super.tasty-expected-failure (drv: {
## Setup: Encountered missing dependencies:
## base >=4.5 && <4.11
## builder for /nix/store/gdm01qb8ppxgrl6dgzhlj8fzmk4x8dj3-tasty-expected-failure-0.11.0.4.drv failed with exit code 1
## error: build of /nix/store/gdm01qb8ppxgrl6dgzhlj8fzmk4x8dj3-tasty-expected-failure-0.11.0.4.drv failed
jailbreak = true;
});
tasty-hedgehog = overrideCabal super.tasty-hedgehog (drv: {
## Setup: Encountered missing dependencies:
## base >=4.8 && <4.11, tasty ==0.11.*
## builder for /nix/store/bpxyzzbmb03n88l4xz4k2rllj4227fwv-tasty-hedgehog-0.1.0.1.drv failed with exit code 1
## error: build of /nix/store/bpxyzzbmb03n88l4xz4k2rllj4227fwv-tasty-hedgehog-0.1.0.1.drv failed
jailbreak = true;
});
text-lens = overrideCabal super.text-lens (drv: {
## Setup: Encountered missing dependencies:
## base >=4.9.0.0 && <4.10,
## extra >=1.4.10 && <1.5,
## hspec >=2.2.4 && <2.3,
## lens ==4.14.*
jailbreak = true;
});
th-abstraction = overrideCabal super.th-abstraction (drv: {
## Setup: Encountered missing dependencies:
## template-haskell >=2.5 && <2.13
## builder for /nix/store/la3zdphp3nqzl590n25zyrgj62ga8cl6-th-abstraction-0.2.6.0.drv failed with exit code 1
## error: build of /nix/store/la3zdphp3nqzl590n25zyrgj62ga8cl6-th-abstraction-0.2.6.0.drv failed
jailbreak = true;
});
these = overrideCabal super.these (drv: {
## Setup: Encountered missing dependencies:
## base >=4.5 && <4.11
## builder for /nix/store/1wwqq67pinjj95fgqg13bchh0kbyrb83-these-0.7.4.drv failed with exit code 1
## error: build of /nix/store/1wwqq67pinjj95fgqg13bchh0kbyrb83-these-0.7.4.drv failed
jailbreak = true;
});
trifecta = overrideCabal super.trifecta (drv: {
## CABAL-MISSING-DEPS
## Setup: Encountered missing dependencies:
## ghc >=7.0 && <8.4
## builder for /nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv failed with exit code 1
## error: build of /nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv failed
doCheck = false;
});
unliftio-core = overrideCabal super.unliftio-core (drv: {
## Setup: Encountered missing dependencies:
## base >=4.5 && <4.11
## builder for /nix/store/bn8w06wlq7zzli0858hfwlai7wbj6dmq-unliftio-core-0.1.1.0.drv failed with exit code 1
## error: build of /nix/store/bn8w06wlq7zzli0858hfwlai7wbj6dmq-unliftio-core-0.1.1.0.drv failed
jailbreak = true;
});
vector-algorithms = overrideCabal super.vector-algorithms (drv: {
## • Ambiguous type variable mv0
doCheck = false;
});
wavefront = overrideCabal super.wavefront (drv: {
## Setup: Encountered missing dependencies:
## base >=4.8 && <4.11
## builder for /nix/store/iy6ccxh4dvp6plalx4ww81qrnhxm7jgr-wavefront-0.7.1.1.drv failed with exit code 1
## error: build of /nix/store/iy6ccxh4dvp6plalx4ww81qrnhxm7jgr-wavefront-0.7.1.1.drv failed
jailbreak = true;
});
}

View File

@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "htslib";
version = "1.6";
version = "1.7";
src = fetchurl {
url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2";
sha256 = "1jsca3hg4rbr6iqq6imkj4lsvgl8g9768bcmny3hlff2w25vx24m";
sha256 = "be3d4e25c256acdd41bebb8a7ad55e89bb18e2fc7fc336124b1e2c82ae8886c6";
};
# perl is only used during the check phase.

View File

@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildPythonPackage, isPy3k
, nose
, nose-parameterized
, parameterized
, mock
, glibcLocales
, six
@@ -23,10 +23,16 @@ buildPythonPackage rec {
sha256 = "0q2vyzvlj46r6pr0s6m1a0md1cpg9nv1n3xw286l4x2cc7fj2g3y";
};
# Replace nose-parameterized by parameterized
prePatch = ''
sed -i s/nose_parameterized/parameterized/g tests/*.py
sed -i s/nose-parameterized/parameterized/g tests/requirements.txt
'';
# Upstream Issue: https://github.com/scrapinghub/dateparser/issues/364
disabled = isPy3k;
checkInputs = [ nose nose-parameterized mock glibcLocales ];
checkInputs = [ nose parameterized mock glibcLocales ];
preCheck =''
# skip because of missing convertdate module, which is an extra requirement
rm tests/test_jalali.py

View File

@@ -1,11 +0,0 @@
{ fetchPypi, parameterized }:
parameterized.overrideAttrs (o: rec {
pname = "nose-parameterized";
version = "0.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "1khlabgib4161vn6alxsjaa8javriywgx9vydddi659gp9x6fpnk";
};
})

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "bear-${version}";
version = "2.2.1";
version = "2.3.11";
src = fetchFromGitHub {
owner = "rizsotto";
repo = "Bear";
rev = version;
sha256 = "1rwar5nvvhfqws4nwyifaysqs3nxpphp48lx9mdg5n6l4z7drz0n";
sha256 = "0r6ykvclq9ws055ssd8w33dicmk5l9pisv0fpzkks700n8d3z9f3";
};
nativeBuildInputs = [ cmake ];
@@ -31,4 +31,3 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.vcunat ];
};
}

View File

@@ -1,31 +1,23 @@
--- Bear-2.2.1-src/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100
+++ Bear-2.2.1-src-patch/bear/main.py.in 2016-11-02 20:23:38.050134984 +0100
@@ -48,6 +48,7 @@
--- Bear-2.3.11-src/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100
+++ Bear-2.3.11-src-patch/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100
@@ -49,6 +49,7 @@
import shutil
import contextlib
import logging
+from distutils.spawn import find_executable
# Ignored compiler options map for compilation database creation.
# The map is used in `split_command` method. (Which does ignore and classify
@@ -447,7 +448,6 @@
# do extra check on number of source files
return result if result.files else None
# Map of ignored compiler option for the creation of a compilation database.
# This map is used in _split_command method, which classifies the parameters
@@ -540,7 +541,11 @@
any(pattern.match(cmd) for pattern in COMPILER_PATTERNS_CXX)
-
def split_compiler(command):
""" A predicate to decide the command is a compiler call or not.
@@ -467,7 +467,11 @@
for pattern in COMPILER_CPP_PATTERNS)
if command: # not empty list will allow to index '0' and '1:'
- executable = os.path.basename(command[0])
+ absolute_executable = os.path.realpath(find_executable(command[0]))
+ if 'wrapper' in absolute_executable:
+ return None
if command: # not empty list will allow to index '0' and '1:'
- executable = os.path.basename(command[0]) # type: str
+ absolute_executable = os.path.realpath(find_executable(command[0]))
+ if 'wrapper' in absolute_executable:
+ return None
+
+ executable = os.path.basename(absolute_executable)
parameters = command[1:]
# 'wrapper' 'parameters' and
# 'wrapper' 'compiler' 'parameters' are valid.
+ executable = os.path.basename(absolute_executable) # type: str
parameters = command[1:] # type: List[str]
# 'wrapper' 'parameters' and
# 'wrapper' 'compiler' 'parameters' are valid.

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "autoconf-archive-${version}";
version = "2017.03.21";
version = "2017.09.28";
src = fetchurl {
url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz";
sha256 = "0rfpapadka2023qhy8294ca5awxpb8d4904js6kv7piby5ax8siq";
sha256 = "00gsh9hkrgg291my98plkrwlcpxkfrpq64pglf18kciqbf2bb7sw";
};
buildInputs = [ xz ];