mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-02 13:00:23 +00:00
Update Haskell package set to LTS 7.1 from 'master'.
This update was generated by hackage2nix v2.0.2-9-gc0b597f from Hackage revision
9ca479bb22.
This commit is contained in:
Peter Simons
@@ -26,9 +26,7 @@ self: super: {
|
||||
c2hs = dontCheck super.c2hs;
|
||||
|
||||
# fix errors caused by hardening flags
|
||||
epanet-haskell = super.epanet-haskell.overrideDerivation (drv: {
|
||||
hardeningDisable = [ "format" ];
|
||||
});
|
||||
epanet-haskell = disableHardening super.epanet-haskell ["format"];
|
||||
|
||||
# This test keeps being aborted because it runs too quietly for too long
|
||||
Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;
|
||||
@@ -45,9 +43,10 @@ self: super: {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "joeyh";
|
||||
repo = "git-annex";
|
||||
sha256 = "1frdld9kgnfd4ll8yx086lwmbqxa5k56y567qw2zy9kz1iiz2fpi";
|
||||
sha256 = "11xgnryvwh3a1dcd5bczrh6wwf23xa74p31cqvnhf2s6q8cb0aai";
|
||||
rev = drv.version;
|
||||
};
|
||||
doCheck = false; # version 6.20160907 has a test suite failure; reported upstream
|
||||
})).overrideScope (self: super: {
|
||||
# https://github.com/prowdsponsor/esqueleto/issues/137
|
||||
persistent = self.persistent_2_2_4_1;
|
||||
@@ -214,24 +213,10 @@ self: super: {
|
||||
jwt = dontCheck super.jwt;
|
||||
|
||||
# https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216
|
||||
gio = pkgs.lib.overrideDerivation (addPkgconfigDepend (
|
||||
addBuildTool super.gio self.gtk2hs-buildtools
|
||||
) pkgs.glib) (drv: {
|
||||
hardeningDisable = [ "fortify" ];
|
||||
});
|
||||
glib = pkgs.lib.overrideDerivation (addPkgconfigDepend (
|
||||
addBuildTool super.glib self.gtk2hs-buildtools
|
||||
) pkgs.glib) (drv: {
|
||||
hardeningDisable = [ "fortify" ];
|
||||
});
|
||||
gtk3 = pkgs.lib.overrideDerivation (super.gtk3.override { inherit (pkgs) gtk3; }) (drv: {
|
||||
hardeningDisable = [ "fortify" ];
|
||||
});
|
||||
gtk = pkgs.lib.overrideDerivation (addPkgconfigDepend (
|
||||
addBuildTool super.gtk self.gtk2hs-buildtools
|
||||
) pkgs.gtk) (drv: {
|
||||
hardeningDisable = [ "fortify" ];
|
||||
});
|
||||
gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.gtk2hs-buildtools) pkgs.glib) ["fortify"];
|
||||
glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib) ["fortify"];
|
||||
gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"];
|
||||
gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"];
|
||||
gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; };
|
||||
gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; };
|
||||
|
||||
@@ -290,8 +275,8 @@ self: super: {
|
||||
HerbiePlugin = dontCheck super.HerbiePlugin;
|
||||
|
||||
# These packages try to access the network.
|
||||
amqp-conduit = dontCheck super.amqp-conduit;
|
||||
amqp = dontCheck super.amqp;
|
||||
amqp-conduit = dontCheck super.amqp-conduit;
|
||||
bitcoin-api = dontCheck super.bitcoin-api;
|
||||
bitcoin-api-extra = dontCheck super.bitcoin-api-extra;
|
||||
bitx-bitcoin = dontCheck super.bitx-bitcoin; # http://hydra.cryp.to/build/926187/log/raw
|
||||
@@ -301,9 +286,11 @@ self: super: {
|
||||
github-types = dontCheck super.github-types; # http://hydra.cryp.to/build/1114046/nixlog/1/raw
|
||||
hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw
|
||||
hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw
|
||||
hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql
|
||||
hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });
|
||||
hoogle = overrideCabal super.hoogle (drv: { testTarget = "--test-option=--no-net"; });
|
||||
hoogle_5_0_4 = super.hoogle_5_0_4.override { haskell-src-exts = self.haskell-src-exts_1_18_2; };
|
||||
marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw
|
||||
mongoDB = dontCheck super.mongoDB;
|
||||
network-transport-tcp = dontCheck super.network-transport-tcp;
|
||||
network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30
|
||||
pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw
|
||||
@@ -337,49 +324,57 @@ self: super: {
|
||||
acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw
|
||||
aeson-lens = dontCheck super.aeson-lens; # http://hydra.cryp.to/build/496769/log/raw
|
||||
aeson-schema = dontCheck super.aeson-schema; # https://github.com/timjb/aeson-schema/issues/9
|
||||
angel = dontCheck super.angel;
|
||||
apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw
|
||||
app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw
|
||||
aws = dontCheck super.aws; # needs aws credentials
|
||||
aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing
|
||||
binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw
|
||||
binary-search = dontCheck super.binary-search;
|
||||
bits = dontCheck super.bits; # http://hydra.cryp.to/build/500239/log/raw
|
||||
bloodhound = dontCheck super.bloodhound;
|
||||
buildwrapper = dontCheck super.buildwrapper;
|
||||
burst-detection = dontCheck super.burst-detection; # http://hydra.cryp.to/build/496948/log/raw
|
||||
cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw
|
||||
cabal-meta = dontCheck super.cabal-meta; # http://hydra.cryp.to/build/497892/log/raw
|
||||
camfort = dontCheck super.camfort;
|
||||
cautious-file = dontCheck super.cautious-file; # http://hydra.cryp.to/build/499730/log/raw
|
||||
CLI = dontCheck super.CLI; # Upstream has no issue tracker.
|
||||
cjk = dontCheck super.cjk;
|
||||
CLI = dontCheck super.CLI; # Upstream has no issue tracker.
|
||||
command-qq = dontCheck super.command-qq; # http://hydra.cryp.to/build/499042/log/raw
|
||||
conduit-connection = dontCheck super.conduit-connection;
|
||||
craftwerk = dontCheck super.craftwerk;
|
||||
css-text = dontCheck super.css-text;
|
||||
damnpacket = dontCheck super.damnpacket; # http://hydra.cryp.to/build/496923/log
|
||||
data-hash = dontCheck super.data-hash;
|
||||
Deadpan-DDP = dontCheck super.Deadpan-DDP; # http://hydra.cryp.to/build/496418/log/raw
|
||||
DigitalOcean = dontCheck super.DigitalOcean;
|
||||
direct-sqlite = dontCheck super.direct-sqlite;
|
||||
directory-layout = dontCheck super.directory-layout;
|
||||
dlist = dontCheck super.dlist;
|
||||
docopt = dontCheck super.docopt; # http://hydra.cryp.to/build/499172/log/raw
|
||||
dom-selector = dontCheck super.dom-selector; # http://hydra.cryp.to/build/497670/log/raw
|
||||
dotfs = dontCheck super.dotfs; # http://hydra.cryp.to/build/498599/log/raw
|
||||
DRBG = dontCheck super.DRBG; # http://hydra.cryp.to/build/498245/nixlog/1/raw
|
||||
ed25519 = dontCheck super.ed25519;
|
||||
either-unwrap = dontCheck super.either-unwrap; # http://hydra.cryp.to/build/498782/log/raw
|
||||
etcd = dontCheck super.etcd;
|
||||
fb = dontCheck super.fb; # needs credentials for Facebook
|
||||
fptest = dontCheck super.fptest; # http://hydra.cryp.to/build/499124/log/raw
|
||||
ghc-events = dontCheck super.ghc-events; # http://hydra.cryp.to/build/498226/log/raw
|
||||
ghc-events-parallel = dontCheck super.ghc-events-parallel; # http://hydra.cryp.to/build/496828/log/raw
|
||||
ghcid = dontCheck super.ghcid;
|
||||
ghc-imported-from = dontCheck super.ghc-imported-from;
|
||||
ghc-parmake = dontCheck super.ghc-parmake;
|
||||
gitlib-cmdline = dontCheck super.gitlib-cmdline;
|
||||
ghcid = dontCheck super.ghcid;
|
||||
git-vogue = dontCheck super.git-vogue;
|
||||
gitlib-cmdline = dontCheck super.gitlib-cmdline;
|
||||
GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50
|
||||
hackport = dontCheck super.hackport;
|
||||
hadoop-formats = dontCheck super.hadoop-formats;
|
||||
haeredes = dontCheck super.haeredes;
|
||||
hashed-storage = dontCheck super.hashed-storage;
|
||||
hashring = dontCheck super.hashring;
|
||||
hastache = dontCheck super.hastache;
|
||||
hath = dontCheck super.hath;
|
||||
haxl-facebook = dontCheck super.haxl-facebook; # needs facebook credentials for testing
|
||||
hdbi-postgresql = dontCheck super.hdbi-postgresql;
|
||||
@@ -411,13 +406,14 @@ self: super: {
|
||||
lensref = dontCheck super.lensref;
|
||||
liquidhaskell = dontCheck super.liquidhaskell;
|
||||
lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25
|
||||
lvmrun = pkgs.lib.overrideDerivation (dontCheck super.lvmrun) (drv: {
|
||||
hardeningDisable = [ "format" ];
|
||||
});
|
||||
lvmrun = disableHardening (dontCheck super.lvmrun) ["format"];
|
||||
memcache = dontCheck super.memcache;
|
||||
MemoTrie = dontHaddock (dontCheck super.MemoTrie);
|
||||
metrics = dontCheck super.metrics;
|
||||
milena = dontCheck super.milena;
|
||||
nats-queue = dontCheck super.nats-queue;
|
||||
netpbm = dontCheck super.netpbm;
|
||||
network = dontCheck super.network;
|
||||
network-dbus = dontCheck super.network-dbus;
|
||||
notcpp = dontCheck super.notcpp;
|
||||
ntp-control = dontCheck super.ntp-control;
|
||||
@@ -438,6 +434,7 @@ self: super: {
|
||||
redis-io = dontCheck super.redis-io;
|
||||
rethinkdb = dontCheck super.rethinkdb;
|
||||
Rlang-QQ = dontCheck super.Rlang-QQ;
|
||||
safecopy = dontCheck super.safecopy;
|
||||
sai-shape-syb = dontCheck super.sai-shape-syb;
|
||||
scp-streams = dontCheck super.scp-streams;
|
||||
sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention
|
||||
@@ -447,7 +444,9 @@ self: super: {
|
||||
static-resources = dontCheck super.static-resources;
|
||||
strive = dontCheck super.strive; # fails its own hlint test with tons of warnings
|
||||
svndump = dontCheck super.svndump;
|
||||
symengine = dontCheck super.symengine;
|
||||
tar = dontCheck super.tar; #http://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit)
|
||||
th-printf = dontCheck super.th-printf;
|
||||
thumbnail-plus = dontCheck super.thumbnail-plus;
|
||||
tickle = dontCheck super.tickle;
|
||||
tpdb = dontCheck super.tpdb;
|
||||
@@ -457,11 +456,13 @@ self: super: {
|
||||
wai-app-file-cgi = dontCheck super.wai-app-file-cgi;
|
||||
wai-logger = dontCheck super.wai-logger;
|
||||
WebBits = dontCheck super.WebBits; # http://hydra.cryp.to/build/499604/log/raw
|
||||
webdriver-angular = dontCheck super.webdriver-angular;
|
||||
webdriver = dontCheck super.webdriver;
|
||||
webdriver-angular = dontCheck super.webdriver-angular;
|
||||
xsd = dontCheck super.xsd;
|
||||
snap-core = dontCheck super.snap-core;
|
||||
sourcemap = dontCheck super.sourcemap;
|
||||
|
||||
# Needs access to locale data, but looks for it in the wrong place.
|
||||
# Needs access to locale data, but looks for it in the wrong place.
|
||||
scholdoc-citeproc = dontCheck super.scholdoc-citeproc;
|
||||
|
||||
# These test suites run for ages, even on a fast machine. This is nuts.
|
||||
@@ -502,7 +503,7 @@ self: super: {
|
||||
duplo = dontCheck super.duplo;
|
||||
|
||||
# Nix-specific workaround
|
||||
xmonad = appendPatch super.xmonad ./patches/xmonad-nix.patch;
|
||||
xmonad = appendPatch (dontCheck super.xmonad) ./patches/xmonad-nix.patch;
|
||||
|
||||
# https://github.com/evanrinehart/mikmod/issues/1
|
||||
mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
|
||||
@@ -764,38 +765,51 @@ self: super: {
|
||||
'';
|
||||
});
|
||||
|
||||
# Byte-compile elisp code for Emacs.
|
||||
structured-haskell-mode = overrideCabal super.structured-haskell-mode (drv: {
|
||||
executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs];
|
||||
# Fine-tune the build.
|
||||
structured-haskell-mode = (overrideCabal super.structured-haskell-mode (drv: {
|
||||
# Bump version to latest git-version to get support for Emacs 25.x.
|
||||
version = "1.0.20-28-g1ffb4db";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "chrisdone";
|
||||
repo = "structured-haskell-mode";
|
||||
sha256 = "1vrycvqp4n2pp6sq7z2v0zkqz6662nvacm7cla5hrrzl157cg0j5";
|
||||
rev = "1ffb4db1e7049d4089fea430d4f20bce2eff263d";
|
||||
};
|
||||
patches = [ (pkgs.fetchpatch {
|
||||
url = "https://github.com/chrisdone/structured-haskell-mode/pull/140.patch";
|
||||
sha256 = "1zwyxfmkl04dy34mbifk24qj9g0sfpz0j8rm688qdah8lavp44df";
|
||||
})
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/chrisdone/structured-haskell-mode/pull/141.patch";
|
||||
sha256 = "1bqgzw8cvxs0yg3yipsayksf7djccslamksm0nkw0kfp22axzmng";
|
||||
})
|
||||
];
|
||||
jailbreak = false;
|
||||
# Statically linked Haskell libraries make the tool start-up much faster,
|
||||
# which is important for use in Emacs.
|
||||
enableSharedExecutables = false;
|
||||
# Make elisp files available at a location where people expect it. We
|
||||
# cannot easily byte-compile these files, unfortunately, because they
|
||||
# depend on a new version of haskell-mode that we don't have yet.
|
||||
postInstall = ''
|
||||
local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
|
||||
pushd >/dev/null $lispdir
|
||||
for i in *.el; do
|
||||
emacs -Q -L . -L ${pkgs.emacs24Packages.haskellMode}/share/emacs/site-lisp \
|
||||
--batch --eval "(byte-compile-disable-warning 'cl-functions)" \
|
||||
-f batch-byte-compile $i
|
||||
done
|
||||
popd >/dev/null
|
||||
local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-"*"/elisp" )
|
||||
mkdir -p $out/share/emacs
|
||||
ln -s $lispdir $out/share/emacs/site-lisp
|
||||
'';
|
||||
});
|
||||
})).override {
|
||||
haskell-src-exts = self.haskell-src-exts_1_18_2;
|
||||
};
|
||||
|
||||
# Byte-compile elisp code for Emacs.
|
||||
# # Make elisp files available at a location where people expect it.
|
||||
hindent = overrideCabal super.hindent (drv: {
|
||||
executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs];
|
||||
# We cannot easily byte-compile these files, unfortunately, because they
|
||||
# depend on a new version of haskell-mode that we don't have yet.
|
||||
postInstall = ''
|
||||
local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
|
||||
pushd >/dev/null $lispdir
|
||||
for i in *.el; do
|
||||
emacs -Q -L . -L ${pkgs.emacs24Packages.haskellMode}/share/emacs/site-lisp \
|
||||
--batch --eval "(byte-compile-disable-warning 'cl-functions)" \
|
||||
-f batch-byte-compile $i
|
||||
done
|
||||
popd >/dev/null
|
||||
mkdir -p $out/share/emacs
|
||||
ln -s $lispdir $out/share/emacs/site-lisp
|
||||
'';
|
||||
doCheck = false; # https://github.com/chrisdone/hindent/issues/299
|
||||
});
|
||||
|
||||
# https://github.com/yesodweb/Shelly.hs/issues/106
|
||||
@@ -867,9 +881,6 @@ self: super: {
|
||||
# https://github.com/guillaume-nargeot/hpc-coveralls/issues/52
|
||||
hpc-coveralls = disableSharedExecutables super.hpc-coveralls;
|
||||
|
||||
# Can't find libHSidris-*.so during build.
|
||||
idris = disableSharedExecutables super.idris;
|
||||
|
||||
# https://github.com/fpco/stackage/issues/838
|
||||
cryptonite = dontCheck super.cryptonite;
|
||||
|
||||
@@ -948,22 +959,9 @@ self: super: {
|
||||
# tinc is a new build driver a la Stack that's not yet available from Hackage.
|
||||
tinc = self.callPackage ../tools/haskell/tinc {};
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/14967
|
||||
yi = markBroken super.yi;
|
||||
yi-fuzzy-open = markBroken super.yi-fuzzy-open;
|
||||
yi-monokai = markBroken super.yi-monokai;
|
||||
yi-snippet = markBroken super.yi-snippet;
|
||||
yi-solarized = markBroken super.yi-solarized;
|
||||
yi-spolsky = markBroken super.yi-spolsky;
|
||||
|
||||
# gtk2hs-buildtools must have Cabal 1.24
|
||||
gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.Cabal_1_24_0_0; };
|
||||
|
||||
# Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza
|
||||
cairo = addBuildTool super.cairo self.gtk2hs-buildtools;
|
||||
pango = (addBuildTool super.pango self.gtk2hs-buildtools).overrideDerivation (drv: {
|
||||
hardeningDisable = [ "fortify" ];
|
||||
});
|
||||
pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"];
|
||||
|
||||
# Fix tests which would otherwise fail with "Couldn't launch intero process."
|
||||
intero = overrideCabal super.intero (drv: {
|
||||
@@ -978,7 +976,6 @@ self: super: {
|
||||
sha256 = "1yh2g45mkfpwxq0vyzcbc4nbxh6wmb2xpp0k7r5byd8jicgvli29";
|
||||
});
|
||||
|
||||
|
||||
# GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for
|
||||
# it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config
|
||||
# depend on freeglut, which provides GHC to necessary information to generate a correct RPATH.
|
||||
@@ -988,14 +985,27 @@ self: super: {
|
||||
# us when we patch the cabal file (Link options will be recored in the ghc package registry).
|
||||
GLUT = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut;
|
||||
|
||||
# remove if a version > 0.1.0.1 ever gets released
|
||||
# https://github.com/Philonous/hs-stun/pull/1
|
||||
# Remove if a version > 0.1.0.1 ever gets released.
|
||||
stunclient = overrideCabal super.stunclient (drv: {
|
||||
postPatch = (drv.postPatch or "") + ''
|
||||
substituteInPlace source/Network/Stun/MappedAddress.hs --replace "import Network.Endian" ""
|
||||
'';
|
||||
});
|
||||
|
||||
# https://bitbucket.org/ssaasen/spy/pull-requests/3/fsnotify-dropped-system-filepath
|
||||
spy = appendPatch super.spy ./patches/spy.patch;
|
||||
idris = overrideCabal super.idris (drv: {
|
||||
# "idris" binary cannot find Idris library otherwise while building. After
|
||||
# installing it's completely fine though. This seems like a bug in Idris
|
||||
# that's related to builds with shared libraries enabled. It would be great
|
||||
# if someone who knows a thing or two about Idris could look into this.
|
||||
preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
|
||||
# https://github.com/idris-lang/Idris-dev/issues/2499
|
||||
librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
|
||||
# test suite cannot find its own "idris" binary
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
# https://github.com/pontarius/pontarius-xmpp/issues/105
|
||||
pontarius-xmpp = dontCheck super.pontarius-xmpp;
|
||||
|
||||
}
|
||||
|
||||
@@ -45,15 +45,6 @@ self: super: {
|
||||
# Build jailbreak-cabal with the latest version of Cabal.
|
||||
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_0_0; };
|
||||
|
||||
idris = overrideCabal super.idris (drv: {
|
||||
# "idris" binary cannot find Idris library otherwise while building.
|
||||
# After installing it's completely fine though. Seems like Nix-specific
|
||||
# issue so not reported.
|
||||
preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
|
||||
# https://github.com/idris-lang/Idris-dev/issues/2499
|
||||
librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
|
||||
});
|
||||
|
||||
Extra = appendPatch super.Extra (pkgs.fetchpatch {
|
||||
url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";
|
||||
sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f";
|
||||
@@ -63,10 +54,6 @@ self: super: {
|
||||
nats = dontHaddock super.nats;
|
||||
bytestring-builder = dontHaddock super.bytestring-builder;
|
||||
|
||||
hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; });
|
||||
|
||||
yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; });
|
||||
|
||||
# Setup: At least the following dependencies are missing: base <4.8
|
||||
hspec-expectations = overrideCabal super.hspec-expectations (drv: {
|
||||
postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
|
||||
@@ -136,7 +123,6 @@ self: super: {
|
||||
prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal";
|
||||
});
|
||||
|
||||
timezone-series = doJailbreak super.timezone-series;
|
||||
timezone-olson = doJailbreak super.timezone-olson;
|
||||
xmonad-extras = overrideCabal super.xmonad-extras (drv: {
|
||||
postPatch = ''
|
||||
@@ -186,7 +172,6 @@ self: super: {
|
||||
# lens-family-th >= 0.5.0.0 is GHC 8.0 only
|
||||
lens-family-th = self.lens-family-th_0_4_1_0;
|
||||
|
||||
|
||||
# The tests in vty-ui do not build, but vty-ui itself builds.
|
||||
vty-ui = enableCabalFlag super.vty-ui "no-tests";
|
||||
|
||||
@@ -205,22 +190,24 @@ self: super: {
|
||||
hackage-security = dontHaddock (dontCheck super.hackage-security);
|
||||
|
||||
# GHC versions prior to 8.x require additional build inputs.
|
||||
aeson_0_11_2_0 = disableCabalFlag (addBuildDepend super.aeson_0_11_2_0 self.semigroups) "old-locale";
|
||||
aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale";
|
||||
case-insensitive = addBuildDepend super.case-insensitive self.semigroups;
|
||||
bytes = addBuildDepend super.bytes self.doctest;
|
||||
hslogger = addBuildDepend super.hslogger self.HUnit;
|
||||
semigroups_0_18_1 = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
|
||||
semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
|
||||
intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]);
|
||||
Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]);
|
||||
Glob = addBuildDepends super.Glob (with self; [semigroups]);
|
||||
Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]);
|
||||
aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale";
|
||||
aeson_0_11_2_0 = disableCabalFlag (addBuildDepend super.aeson_0_11_2_0 self.semigroups) "old-locale";
|
||||
bytes = addBuildDepend super.bytes self.doctest;
|
||||
case-insensitive = addBuildDepend super.case-insensitive self.semigroups;
|
||||
hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; });
|
||||
hslogger = addBuildDepend super.hslogger self.HUnit;
|
||||
intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]);
|
||||
lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
|
||||
semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
|
||||
semigroups_0_18_1 = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
|
||||
texmath = addBuildDepend super.texmath self.network-uri;
|
||||
yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; });
|
||||
# cereal must have `fail` in pre-ghc-8.0.x versions
|
||||
# also tests require bytestring>=0.10.8.1
|
||||
cereal = dontCheck (addBuildDepend super.cereal self.fail);
|
||||
cereal_0_5_2_0 = dontCheck (addBuildDepend super.cereal_0_5_2_0 self.fail);
|
||||
lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
|
||||
cheapskate = addBuildDepends super.cheapskate (with self; [aeson http-types wai wai-extra]);
|
||||
|
||||
# Moved out from common as no longer the case for GHC8
|
||||
ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; };
|
||||
|
||||
@@ -98,6 +98,7 @@ self: super: {
|
||||
|
||||
# Needs additional inputs on pre 7.10.x compilers.
|
||||
semigroups = addBuildDepends super.semigroups (with self; [bytestring-builder nats tagged unordered-containers transformers]);
|
||||
lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
|
||||
|
||||
# Haddock doesn't cope with the new markup.
|
||||
bifunctors = dontHaddock super.bifunctors;
|
||||
|
||||
@@ -141,6 +141,7 @@ self: super: {
|
||||
|
||||
# Needs additional inputs on pre 7.10.x compilers.
|
||||
semigroups = addBuildDepends super.semigroups (with self; [nats tagged unordered-containers]);
|
||||
lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
|
||||
|
||||
# Haddock doesn't cope with the new markup.
|
||||
bifunctors = dontHaddock super.bifunctors;
|
||||
|
||||
@@ -54,12 +54,6 @@ self: super: {
|
||||
broken = true; # needs template-haskell >=2.9 && <2.11
|
||||
}) {};
|
||||
|
||||
# https://github.com/ygale/timezone-series/issues/2
|
||||
timezone-series = appendPatch super.timezone-series (pkgs.fetchpatch {
|
||||
url = "https://github.com/ryantrinkle/timezone-series/commit/f8dece8c016db6476e2bb0d4f972769a76f6ff40.patch";
|
||||
sha256 = "01wxhknsnn7lyl9v8viz7m5zhmyi3bqpbva7d3dx1dxn0nmkfh6a";
|
||||
});
|
||||
|
||||
# https://github.com/bmillwood/applicative-quoters/issues/6
|
||||
applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch";
|
||||
|
||||
@@ -122,4 +122,11 @@ self: super:
|
||||
] drv.libraryHaskellDepends;
|
||||
});
|
||||
|
||||
http2 = addBuildDepends super.http2 [ self.aeson self.aeson-pretty self.hex self.unordered-containers self.vector self.word8 ];
|
||||
# ghcjsBoot uses async 2.0.1.6, protolude wants 2.1.*
|
||||
protolude = doJailbreak super.protolude;
|
||||
semigroups = addBuildDepends super.semigroups [ self.hashable self.unordered-containers self.text self.tagged ];
|
||||
# triggers an internal pattern match failure in haddock
|
||||
# https://github.com/haskell/haddock/issues/553
|
||||
wai = dontHaddock super.wai;
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -49,7 +49,7 @@ let
|
||||
overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args;
|
||||
};
|
||||
|
||||
mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome // scope;
|
||||
mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope;
|
||||
defaultScope = mkScope self;
|
||||
callPackage = drv: args: callPackageWithScope defaultScope drv args;
|
||||
|
||||
@@ -87,7 +87,7 @@ let
|
||||
packages = selectFrom self;
|
||||
hoogle = callPackage ./hoogle.nix {
|
||||
inherit packages;
|
||||
hoogle = self.hoogle_4_2_43;
|
||||
hoogle = self.hoogle_5_0_4;
|
||||
};
|
||||
in withPackages (packages ++ [ hoogle ]);
|
||||
|
||||
|
||||
@@ -47,6 +47,7 @@
|
||||
, shellHook ? ""
|
||||
, coreSetup ? false # Use only core packages to build Setup.hs.
|
||||
, useCpphs ? false
|
||||
, hardeningDisable ? []
|
||||
} @ args:
|
||||
|
||||
assert editedCabalFile != null -> revision != null;
|
||||
@@ -329,5 +330,6 @@ stdenv.mkDerivation ({
|
||||
// optionalAttrs (preFixup != "") { inherit preFixup; }
|
||||
// optionalAttrs (postFixup != "") { inherit postFixup; }
|
||||
// optionalAttrs (dontStrip) { inherit dontStrip; }
|
||||
// optionalAttrs (hardeningDisable != []) { inherit hardeningDisable; }
|
||||
// optionalAttrs (stdenv.isLinux) { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; }
|
||||
)
|
||||
|
||||
@@ -29,7 +29,10 @@ stdenv.mkDerivation (args // {
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
configurePhase = args.configurePhase or "stack setup";
|
||||
configurePhase = args.configurePhase or ''
|
||||
export STACK_ROOT=$NIX_BUILD_TOP/.stack
|
||||
stack setup
|
||||
'';
|
||||
|
||||
buildPhase = args.buildPhase or "stack build";
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -2,4 +2,4 @@
|
||||
|
||||
COMMAND=$1
|
||||
shift
|
||||
exec @hoogle@/bin/hoogle "$COMMAND" -d @out@/share/doc/hoogle "$@"
|
||||
exec @hoogle@/bin/hoogle "$COMMAND" --database @out@/share/doc/hoogle/default.hoo "$@"
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
# This will build mmorph and monadControl, and have the hoogle installation
|
||||
# refer to their documentation via symlink so they are not garbage collected.
|
||||
|
||||
{ lib, stdenv, hoogle, rehoo, writeText
|
||||
{ lib, stdenv, hoogle, writeText
|
||||
, ghc, packages ? [ ghc.ghc ]
|
||||
}:
|
||||
|
||||
@@ -54,7 +54,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "hoogle-local-0.1";
|
||||
buildInputs = [hoogle rehoo];
|
||||
buildInputs = [ghc hoogle];
|
||||
|
||||
phases = [ "buildPhase" ];
|
||||
|
||||
@@ -68,22 +68,11 @@ stdenv.mkDerivation {
|
||||
|
||||
mkdir -p $out/share/doc/hoogle
|
||||
|
||||
function import_dbs() {
|
||||
find $1 -name '*.txt' | while read f; do
|
||||
newname=$(basename "$f" | tr '[:upper:]' '[:lower:]')
|
||||
if [[ -f $f && ! -f ./$newname ]]; then
|
||||
cp -p $f "./$newname"
|
||||
hoogle convert -d "$(dirname $f)" "./$newname"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
echo importing builtin packages
|
||||
for docdir in ${ghc.doc}/${docLibGlob}/*; do
|
||||
name="$(basename $docdir)"
|
||||
${opts isGhcjs ''docdir="$docdir/html"''}
|
||||
if [[ -d $docdir ]]; then
|
||||
import_dbs $docdir
|
||||
ln -sfn $docdir $out/share/doc/hoogle/$name
|
||||
fi
|
||||
done
|
||||
@@ -92,10 +81,9 @@ stdenv.mkDerivation {
|
||||
for i in $docPackages; do
|
||||
if [[ ! $i == $out ]]; then
|
||||
for docdir in $i/share/doc/*-${ghcName}-*/* $i/share/doc/*; do
|
||||
name=`basename $docdir`
|
||||
name="$(basename $docdir)"
|
||||
docdir=$docdir/html
|
||||
if [[ -d $docdir ]]; then
|
||||
import_dbs $docdir
|
||||
ln -sfn $docdir $out/share/doc/hoogle/$name
|
||||
fi
|
||||
done
|
||||
@@ -103,13 +91,7 @@ stdenv.mkDerivation {
|
||||
done
|
||||
|
||||
echo building hoogle database
|
||||
# FIXME: rehoo is marked as depricated on Hackage
|
||||
chmod 644 *.hoo *.txt
|
||||
rehoo -j$NIX_BUILD_CORES -c64 .
|
||||
|
||||
mv default.hoo .x
|
||||
rm -fr downloads *.dep *.txt *.hoo
|
||||
mv .x $out/share/doc/hoogle/default.hoo
|
||||
hoogle generate --database $out/share/doc/hoogle/default.hoo --local=$out/share/doc/hoogle
|
||||
|
||||
echo building haddock index
|
||||
# adapted from GHC's gen_contents_index
|
||||
|
||||
@@ -62,6 +62,8 @@ rec {
|
||||
doHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = true; });
|
||||
dontHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = false; });
|
||||
|
||||
disableHardening = drv: flags: overrideCabal drv (drv: { hardeningDisable = flags; });
|
||||
|
||||
sdistTarball = pkg: pkgs.lib.overrideDerivation pkg (drv: {
|
||||
name = "${drv.pname}-source-${drv.version}";
|
||||
buildPhase = "./Setup sdist";
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "tinc";
|
||||
version = "20160511";
|
||||
version = "20160924";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sol";
|
||||
repo = "tinc";
|
||||
rev = "405af997c182b89edfc9656612c32616e98c7862";
|
||||
sha256 = "0zryw3abp64922dnk6jss58lq4k7ijwbbn35zh5vbg3ns8307k6b";
|
||||
rev = "f5ba99264930a2af2f24770a23af2613acdac631";
|
||||
sha256 = "19mvswpjak9dxpd4w86fz1wv0zkn6ippc37gdkhyg4xcj9jn21a9";
|
||||
};
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
|
||||
@@ -238,11 +238,22 @@ rec {
|
||||
lts-6_4 = packages.ghc7103;
|
||||
lts-6_5 = packages.ghc7103;
|
||||
lts-6_6 = packages.ghc7103;
|
||||
lts-6_7 = packages.ghc7103.override {
|
||||
packageSetConfig = callPackage ../development/haskell-modules/configuration-lts.nix { };
|
||||
};
|
||||
lts-6 = packages.lts-6_7;
|
||||
lts-6_7 = packages.ghc7103;
|
||||
lts-6_8 = packages.ghc7103;
|
||||
lts-6_9 = packages.ghc7103;
|
||||
lts-6_10 = packages.ghc7103;
|
||||
lts-6_11 = packages.ghc7103;
|
||||
lts-6_12 = packages.ghc7103;
|
||||
lts-6_13 = packages.ghc7103;
|
||||
lts-6_14 = packages.ghc7103;
|
||||
lts-6_15 = packages.ghc7103;
|
||||
lts-6_16 = packages.ghc7103;
|
||||
lts-6_17 = packages.ghc7103;
|
||||
lts-6 = packages.lts-6_17;
|
||||
|
||||
lts = packages.lts-6;
|
||||
lts-7_0 = packages.ghc801;
|
||||
lts-7 = packages.lts-7_0;
|
||||
|
||||
lts = packages.lts-7;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user