JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,516 Commits 2 Branches 0 Tags 12 GiB
40a58dbcbb
Commit Graph

40034 Commits

Author SHA1 Message Date
Jörg Thalheim
e5b97e36c5 Merge pull request #29642 from Zimmi48/update-compcert 
Update CompCert
 2017-09-21 18:30:39 +01:00
Shea Levy
c3b41a77e6 openldap: Use a global localstatedir 2017-09-21 08:18:45 -06:00
Théo Zimmermann
8fde5790b4 compcert: fix license 
The license of CompCert is not a generic "INRIA" license. It is "INRIA Non-Commercial
Agreement for the CompCert verified compiler". As unfortunate as it may seem, this
is a non-free license (clearly mentioned as such in its preamble). See also #20256.
 2017-09-21 15:24:17 +02:00
Théo Zimmermann
3370615a7f compcert: 3.0.1 -> 3.1 
Note that the fix of the VERSION file can likely be removed at the next update.
 2017-09-21 15:06:51 +02:00
Tim Steinbach
182dd6a9d6 Merge pull request #29634 from edwtjo/jbjdk 
jetbrains-jdk
 2017-09-21 08:42:01 -04:00
Théophane Hufschmitt
e76c2c1496 pythonPackages.pafy: 0.5.2 -> 0.5.3.1 (#29588) 
* pythonPackages.pafy: 0.5.2 -> 0.5.3.1

* pythonPackages.pafy: move to its own file

* pythonPackages.pafy: fetchurl -> fetchPypi
 2017-09-21 12:45:33 +01:00
José Romildo Malaquias
595d92eb7a ocamlfuse: 2.7-3 -> 2.7.1_cvs5 (#29606) 2017-09-21 12:14:22 +01:00
Jörg Thalheim
8da89ab658 Merge pull request #29635 from andir/update-afew-to-1.2.0 
afew: git-2017-02-8 -> 1.2.0
 2017-09-21 11:56:16 +01:00
Andreas Rammhold
559d8d4c3a
afew: git-2017-02-8 -> 1.2.0 2017-09-21 10:52:52 +02:00
Edward Tjörnhammar
85cd648778 jetbrains.jdk: style fixes, platform restriction 2017-09-21 10:48:02 +02:00
Aleksey Kladov
53337c0fc8 jetbrains.jdk: init at 152b970.2 2017-09-21 10:48:02 +02:00
Jörg Thalheim
116c34a748 Merge pull request #29613 from bcdarwin/nifti 
nifticlib: init at 2.0.0
 2017-09-21 09:11:39 +01:00
Jörg Thalheim
aab8f8df4b nifticlib: use mirror for sourceforge 2017-09-21 09:10:12 +01:00
Nick Novitski
5ddfcc774c gemconfig: add curb 2017-09-20 23:53:25 -07:00
John Ericson
df0c265ee1 Merge pull request #29625 from obsidiansystems/linuxHeadersCross 
glibc: Grab the right linux headers when build != host
 2017-09-20 21:13:54 -04:00
John Ericson
8bfb247224 glibc: Grab the right linux headers when build != host 
In #28519 / 791ce593ce I made linux
headers be intended to be used from the stage stage, as it would be if
it were a library containing headers and code. I forgot to update glibc,
however, so it was incorrectly using headers for the build platform, not
host platform.

This fixes that, basically reverting a small portion of changes I made a
few months ago in 25edc476fd and its
parent.

No native hashes are changed.
 2017-09-20 20:57:41 -04:00
Ben Darwin
0d981c5761 nifticlib: init at 2.0.0 2017-09-20 19:04:22 -04:00
Joachim Fasting
3e96cee147
hydra: 2017-07-27 -> 2017-09-14 
Builds against recent nixUnstable
 2017-09-21 01:02:02 +02:00
Joachim F
29c1888a57 Merge pull request #29560 from LumiGuide/elk-5.6.1 
elk: 5.5.2 -> 5.6.1
 2017-09-20 21:56:26 +00:00
Joachim Fasting
7a1f5bad0c
ocamlPackages.csv: fix meta eval 
fetchurl does not expose a meta.homepage attr
 2017-09-20 22:15:26 +02:00
Michael Weiss
9182927998 gengetopt: Fix the build 
Thanks @orivej for providing this fix.

Fix #28255 (the build was broken since
2bc7b4e134).
 2017-09-20 19:32:06 +02:00
Tuomas Tynkkynen
ecebb6090a pythonPackages.flake8-future-import: Init at 0.4.3 2017-09-20 17:55:31 +03:00
Peter Simons
0dddef468d hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.5-9-g8a6ffec-dirty from Hackage revision
9e7aa353cc.
 2017-09-20 16:18:36 +02:00
Tim Steinbach
e200cfbae1
sbt: 1.0.1 -> 1.0.2 2017-09-20 09:42:03 -04:00
Moritz Kiefer
d5a33e8f38 ghcjsHEAD: bump ghcjs shims 2017-09-20 10:59:22 +02:00
John Ericson
e9c1f64048 Merge branch 'master' into staging 2017-09-20 01:39:59 -04:00
Vincent Laporte
1e9deaad66 ocamlPackages.csv: 1.7 -> 2.0 2017-09-20 05:39:12 +00:00
John Ericson
19e3c580ad Merge pull request #29584 from obsidiansystems/no-wrapCCCross 
top-level: Remove useless abstractions
 2017-09-20 01:25:02 -04:00
John Ericson
1fc12241ed all-packages: get rid of wrapCCCross 
It's unneeded
 2017-09-20 00:59:19 -04:00
Jörg Thalheim
c1de354a3d libwebsockets: revert making libuv a propagated build input 
it is possible to use libwebsockets without libuv

cc @volth
 2017-09-20 02:49:31 +01:00
Jörg Thalheim
d6191bd6c2 Merge pull request #29566 from Mic92/gdbm 
gdbm: add symlinks for compatibility
 2017-09-20 02:41:57 +01:00
Ruben Maher
1787043323 flow: 0.54.0 -> 0.55.0 2017-09-20 10:12:36 +09:30
Jörg Thalheim
06de6d59b0 Merge pull request #29525 from aneeshusa/radicale_infcloud-init 
radicale_infcloud: init
 2017-09-19 22:22:16 +01:00
Franz Pletz
0a2c39e205
p11_kit: don't build documentation 
This depends ultimately on texlive which is a big build and depends on
lots of libraries which often get security updates. This triggers
mass rebuilds because systemd depends on gnutls which depends on
p11_kit.

This was introduced with 93d80f1951.
 2017-09-19 22:24:36 +02:00
Jörg Thalheim
6d423da7cc libwebsockets: fix eval 2017-09-19 21:14:53 +01:00
volth
4916f64948 libwebsockets: 1.4 -> 2.3.0 2017-09-19 20:30:51 +01:00
Samuel Leathers
367e30b8f3 libxmlxx: move glibmm to propagatedBuildInputs 2017-09-19 14:13:59 -04:00
Vladimír Čunát
d4c33d5e4e
Merge branch 'master' into staging 2017-09-19 18:03:09 +02:00
Vladimír Čunát
16cf448933
gettext, gcc5: enable stackprotector now 
This has been forgotten in #29349 ?
 2017-09-19 17:52:32 +02:00
Aneesh Agrawal
a9f8207f9f radicale_infcloud: init 2017-09-19 08:20:39 -07:00
Peter Simons
2439a83072 haskell.lib: strip trailing whitespace 2017-09-19 15:55:50 +02:00
Peter Simons
a8b69958cf haskell.lib: add doBenchmark helper function 2017-09-19 15:55:16 +02:00
Peter Simons
eab41cb7be hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.5-8-ga66a429 from Hackage revision
511efbfbe7.
 2017-09-19 15:48:00 +02:00
Peter Simons
8231045fb4 LTS Haskell 9.5 2017-09-19 15:47:58 +02:00
Peter Simons
33e34aa95b haskell-generic-builder: rename withBenchmarkDepends argument to doBenchmark 
This partially undoes the change from 8788bfe762.
The 'doBenchmark' name is more consistent with the naming scheme used for
other phases, like 'doCheck', 'doHaddock', etc.
 2017-09-19 15:42:51 +02:00
Jörg Thalheim
3170d8608d gdbm: add symlinks for compatibility 
some tools check this location to distinguish between gdbm and ndbm
 2017-09-19 12:27:15 +01:00
Bas van Dijk
ea8e7ed1e3 elk: 5.5.2 -> 5.6.1 
Release notes:

* https://www.elastic.co/guide/en/elasticsearch/reference/5.6/release-notes-5.6.1.html
* https://www.elastic.co/guide/en/logstash/5.6/logstash-5-6-1.html
* https://www.elastic.co/guide/en/kibana/current/release-notes-5.6.1.html
 2017-09-19 10:52:08 +02:00
Tuomas Tynkkynen
bc850cfed5 qt4: Add aarch64 patch 2017-09-19 10:59:11 +03:00
Jörg Thalheim
11efdaf404 Merge pull request #29522 from aneeshusa/libevent-make-openssl-dependency-optional 
libevent: Make OpenSSL dependency optional
 2017-09-19 08:48:34 +01:00
zimbatm
3920a44628 fixes missing attributes 2017-09-19 00:39:35 +01:00
Samuel Leathers
bef916338d pydub 0.16.7 -> 0.20.0 2017-09-19 00:00:10 +02:00
rybern
1d0c8f8687 pythonPackages.pomegranate: init at 0.7.7 (#29338) 2017-09-18 23:52:25 +02:00
Samuel Leathers
6d367ba9f3 eve: 0.6.1 -> 0.7.4 2017-09-18 23:26:43 +02:00
Samuel Leathers
756cd8a6c4 pymongo: 3.0.3 -> 3.5.1 2017-09-18 23:26:43 +02:00
Samuel Leathers
96bd8daebc dyn: 1.5.0 -> 1.6.3 2017-09-18 23:22:44 +02:00
Samuel Leathers
7fa2c54a60 awesome-slugify: fixes tests 2017-09-18 23:21:24 +02:00
Franz Pletz
384b64426e Merge pull request #29486 from disassembler/logilab 
logilab_common: 0.63.2 -> 1.4.1
 2017-09-18 23:18:52 +02:00
Franz Pletz
8a401881fe Merge pull request #29534 from etu/update-gocode 
gocode: 20170530 -> 20170903
 2017-09-18 23:10:51 +02:00
volth
9efe27ee3b haxe: 3.4.2 -> 3.4.3 2017-09-18 23:09:07 +02:00
Kranium Gikos Mendoza
caa79ba50c xmlsec: enable deprecated headers required by lasso 2017-09-18 23:07:43 +02:00
Franz Pletz
0653abc07a
gd: 2.2.4 -> 2.2.5 for multiple CVEs 
Fixes:
  * CVE-2017-6362
  * CVE-2017-7890
 2017-09-18 22:45:30 +02:00
Daiderd Jordan
69bf06ad6c
gperftools: fix darwin build 2017-09-18 22:20:57 +02:00
Aneesh Agrawal
42a8ac1b71 libevent: Make OpenSSL dependency optional 2017-09-18 09:21:54 -07:00
Elis Hirwing
0eb1fdc50a
gocode: 20170530 -> 20170903 2017-09-18 17:53:25 +02:00
Franz Pletz
0e550fd51c
cdo: 1.7.2 -> 1.9.0 2017-09-18 17:24:08 +02:00
Samuel Leathers
2f9cb45bd4 mpi4py: disabling tests 2017-09-18 15:11:14 +02:00
Mathias Schreck
9d2a2dc43e nodejs: 8.4.0 -> 8.5.0 2017-09-18 13:51:27 +02:00
Mathias Schreck
f4b207438d libuv: 1.13.1 -> 1.14.1 2017-09-18 13:50:56 +02:00
Samuel Leathers
3a33ed7c46 trollius: fix tests 2017-09-18 12:00:46 +02:00
Samuel Leathers
28a9f74769 discogs_client: 2.0.2 -> 2.2.0 2017-09-18 11:59:21 +02:00
Samuel Leathers
700b0945b1 marionette-harness: disable for python 3 2017-09-18 07:35:18 +02:00
Samuel Leathers
cbea57b9c7 marionette-driver: disable for python 3 2017-09-18 07:35:18 +02:00
Samuel Leathers
d355b55e82 interruptingcow: 0.6 -> 0.7 2017-09-18 07:32:57 +02:00
AndersonTorres
3dc65ee2e8 tcllib: 1.15 -> 1.18 2017-09-18 04:05:50 +02:00
Daiderd Jordan
036036a456 Merge pull request #29254 from knedlsepp/fix-valgrind 
valgrind: Fix darwin build
 2017-09-17 20:09:56 +02:00
Michael Raskin
66351498d6 julia_06: init at 0.6.0; make the default julia 2017-09-17 17:09:51 +02:00
Frederik Rietdijk
96d15eaddb python27: support test/support 
In the maintenance release bump in
90059701a8 a certain change to /test/ was
backported from Python 3:

- bpo-30207: To simplify backports from Python 3, the test.test_support
  module was converted into a package and renamed to test.support.  The
  test.script_helper module was moved into the test.support package.
  Names test.test_support and test.script_helper are left as aliases to
  test.support and test.support.script_helper.
 2017-09-17 11:09:26 +02:00
Frederik Rietdijk
bebdd7ac61 python.pkgs.subprocess32: 3.2.6 -> 3.2.7 2017-09-17 11:09:26 +02:00
Vladimír Čunát
96647a6985
Merge #29311: texinfo: 6.3 -> 6.5 2017-09-17 10:35:43 +02:00
Vladimír Čunát
f6763a4561
Merge #29431: libxml2: 2.9.4 -> 2.9.5 2017-09-17 10:35:39 +02:00
Michael Raskin
02f439d062 cppunit: 1.14.0 2017-09-17 09:58:34 +02:00
Michael Raskin
44db65d61c xmlsec: 1.2.23 -> 1.2.25; enable nss (for LO) 2017-09-17 09:58:34 +02:00
Frederik Rietdijk
90059701a8 python27: 2.7.13 -> 2.7.14 
The enosys patch is not needed anymore since the patch is included in
this maintenance release.
 2017-09-17 09:57:55 +02:00
Joachim Fasting
40d6414863 lttng-uts: 2.9.1 -> 2.10.0 2017-09-17 09:44:04 +02:00
Joachim Fasting
969db57853 lttng-tools: 2.9.5 -> 2.10.1 2017-09-17 09:44:04 +02:00
Bjørn Forsman
f557aa49fb Fix eval 
$ nix-env -f . -qa '*' --meta --xml --drv-path --show-trace
error: while querying the derivation named ‘python2.7-rpkg-1.50’:
attribute ‘gpl2plus’ missing, at .../pkgs/development/python-modules/rpkg/default.nix:24:15

Introduced by commit c29a721350
("rpkg: 1.14 -> 1.50").
 2017-09-17 09:41:28 +02:00
Frederik Rietdijk
4db4476536 Merge pull request #29465 from FRidh/aspell 
aspellWithDicts: use a single env
 2017-09-17 09:29:47 +02:00
Frederik Rietdijk
f58e082e01 Merge pull request #29455 from disassembler/fedora 
Fedora packaging tools update
 2017-09-17 09:26:54 +02:00
Frederik Rietdijk
43b6116d7f Merge pull request #29484 from disassembler/internetarchive 
internetarchive: 0.8.3 -> 1.7.2
 2017-09-17 09:25:47 +02:00
Samuel Leathers
dce4276d5e logilab_common: 0.63.2 -> 1.4.1 2017-09-16 21:14:11 -04:00
Samuel Leathers
4db4f70be6 logilab-constraint: move to python-modules 2017-09-16 21:13:48 -04:00
Samuel Leathers
80625b6012 internetarchive: 0.8.3 -> 1.7.2 2017-09-16 19:24:29 -04:00
Samuel Leathers
d8848c0202 backports.csv: init at 1.0.5 2017-09-16 19:23:05 -04:00
Thomas Mader
59cdc2564c ldc: Disable check phase because some tests are not working if build has 
sandboxing enabled
 2017-09-17 00:16:58 +02:00
Thomas Mader
4535008a4c dmd: Disable check phase because some tests are not working if build has 
sandboxing enabled
 2017-09-17 00:15:31 +02:00
Samuel Leathers
c8f55331df schema: init at 0.6.6 2017-09-16 17:25:21 -04:00
Vladimír Čunát
222e18698a
gtkmm3: maintenance 3.22.0 -> 3.22.2 2017-09-16 23:05:55 +02:00
Eelco Dolstra
afc0218ecd blender: Fix CUDA support 
CUDA toolkit 8 doesn't support gcc 6, so we have to build opensubdiv
and blender with gcc 5.
 2017-09-16 22:45:22 +02:00
Eelco Dolstra
bb1c9b027d cudatoolkit: Move libcudart to a separate output 
This prevents opensubdiv (and thus blender) from having all of
cudatoolkit in its closure.
 2017-09-16 22:45:14 +02:00
Eelco Dolstra
63f3b35204 opencollada: 1.3 -> 1.6.59 2017-09-16 22:44:39 +02:00
Daiderd Jordan
35649750c3
python-cffi: fix test failures when using clang 2017-09-16 16:32:40 +02:00
Jörg Thalheim
9313bd7388 Merge pull request #29435 from disassembler/arelle 
arelle: 2017-06-01 -> 2017-08-24
 2017-09-16 14:04:21 +01:00
Samuel Leathers
d15c019edd arelle: 2017-06-01 -> 2017-08-24 2017-09-16 09:01:48 -04:00
Samuel Leathers
eb125adf24 aiohttp-cors: 0.5.1 -> 0.5.3 2017-09-16 13:56:00 +01:00
Thomas Mader
8fa1b39279 dmd: Fix bootstrap dmd to build with sandboxing of nixUnstable 2017-09-16 14:27:49 +02:00
Jörg Thalheim
a5ed2f141c Merge pull request #29456 from disassembler/hglib 
hglib: 1.7 -> 2.4
 2017-09-16 13:27:02 +01:00
Jörg Thalheim
97b66c8f5f Merge pull request #29447 from disassembler/hcs_utils 
hcs_utils: 1.5 -> 2.0
 2017-09-16 13:07:23 +01:00
Jörg Thalheim
46c30b2232 python.pkgs.hcs_utils: fix tests; disable python2 2017-09-16 13:06:12 +01:00
Samuel Leathers
7ffea453b8 jscoverage: fix build with gcc6 (#29423) 2017-09-16 13:20:38 +02:00
Thomas Mader
d2fdc9cb1f dmd: Add darwin/Foundation dependency to fix build on Darwin 2017-09-16 13:16:47 +02:00
Frederik Rietdijk
91f7042aa0 aspellWithDicts: use a single env 
In c0cf19608f the function
`aspellWithDicts` was introduced, that allows to build a derivation
consisting of aspell and specified dictionaries. In
96457d26dd a fix was included to properly
find the dictionaries.

Issue #29429 describes that, while the current method works for the
aspell binary, it does not in case of the API.

This commit rewrites the wrapper into a single derivation, create a
single tree of symbolic references to both the binary and the
dictionaries so that its possible to find the dictionaries with the API.
Furthermore, the binary is wrapped so it can still find the dictionaries
as well.
 2017-09-16 13:06:26 +02:00
Frederik Rietdijk
03fa6965ad Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-16 12:34:32 +02:00
Frederik Rietdijk
6712e0111a Merge pull request #29422 from disassembler/gensim 
moto: 0.4.25 -> 0.4.31
 2017-09-16 12:32:48 +02:00
Frederik Rietdijk
4f8ad9f7eb python.pkgs.spacy_models: fix eval 2017-09-16 12:21:20 +02:00
Joachim F
2d3886262e Merge pull request #29439 from oxij/pkgs/notmuch-gmime-3 
gmime3: init; notmuch: use gmime3
 2017-09-16 10:15:55 +00:00
Frederik Rietdijk
e8f873671f Merge pull request #29334 from rvl/python-textacy 
pythonPackages.textacy: init at 0.4.1
 2017-09-16 11:29:44 +02:00
Jan Malakhovski
04e97f9868 gmime: expose versions 2017-09-16 09:20:05 +00:00
Servilio Afre Puentes
9785fc73a0 gmime: init at 3.0.1, leave 2.6.23 as is 
This needs to be added as a separate package because API changed in 3.0, see:

https://mail.gnome.org/archives/gmime-devel-list/2017-April/msg00002.html
https://developer.gnome.org/gmime/3.0/gmime-changes-3-0.html
3fd646c955/PORTING
 2017-09-16 09:20:05 +00:00
Rodney Lorrimar
fdb90edc6c pythonPackages.pyphen: init at 0.9.4 2017-09-16 09:23:17 +01:00
Rodney Lorrimar
c5d1218336 pythonPackages.ijson: init at 2.3 2017-09-16 09:23:17 +01:00
Rodney Lorrimar
d851b95d63 pythonPackages.clld-cffi: init at 0.1.4 2017-09-16 09:23:17 +01:00
Rodney Lorrimar
fad89eda77 pythonPackages.spacy: add models data attr set 
Model                   Version
es_core_web_md          1.0.0
fr_depvec_web_lg        1.0.0
en_core_web_md          1.2.1
en_depent_web_md        1.2.1
en_core_web_sm          1.2.0
de_core_news_md         1.0.0
en_vectors_glove_md     1.0.0
 2017-09-16 09:23:17 +01:00
Rodney Lorrimar
3b1877f4c0 pythonPackages.textacy: init at 0.4.1 2017-09-16 09:23:16 +01:00
Rodney Lorrimar
18161a5b6f pythonPackages.pyemd: init at 0.4.4 
This module is a requirement of textacy.
 2017-09-16 09:23:16 +01:00
Rodney Lorrimar
31037bab49 pythonPackages.cachetools: Add version 2.0.1 
Textacy requires a later version.

v2.0.0 introduced breaking changes, so keep two versions for other
packages.
 2017-09-16 09:23:15 +01:00
Rodney Lorrimar
151d0fde19 pythonPackages.unidecode: 0.04.18 -> 0.04.21 
Higher version is a requirement of textacy.
 2017-09-16 09:23:15 +01:00
Samuel Leathers
c256a685e8 hglib: 1.7 -> 2.4 2017-09-16 00:46:27 -04:00
Samuel Leathers
c29a721350 rpkg: 1.14 -> 1.50 2017-09-16 00:11:06 -04:00
Samuel Leathers
e544c36dbe fedpkg: 1.14 -> 1.29 2017-09-16 00:11:06 -04:00
Samuel Leathers
3693aa6141 python_fedora: 0.5.5 -> 0.9.0 2017-09-16 00:11:06 -04:00
Samuel Leathers
5f6a20f291 urlgrabber: 3.9.1 -> 3.10.2 2017-09-16 00:11:06 -04:00
Samuel Leathers
e1182f070f koji: 1.8 -> 1.13.0 2017-09-16 00:11:05 -04:00
Samuel Leathers
673e8caab2 rpmfluff: init at 0.5.3 2017-09-16 00:11:05 -04:00
Samuel Leathers
06e2b99546 cccolutils: init at 1.5 2017-09-16 00:11:05 -04:00
Samuel Leathers
dfa4a56d6c openidc-client: init at 0.2.0 2017-09-15 22:43:11 -04:00
Samuel Leathers
755e6eb22e hcs_utils: 1.5 -> 2.0 2017-09-15 21:03:51 -04:00
Samuel Leathers
f8f62d5216 nilearn: 0.2.5 -> 0.3.1 
fixes #29178
 2017-09-16 00:25:11 +01:00
Tuomas Tynkkynen
a0a8f0ac87 python2: Use system libffi on Aarch64 
libffi needs a patch to actually work on aarch64 (or the cffi Python package
fails its testsuite). Of course the bundled version of libffi has the
same bug, so don't use the buggy version on aarch64.

Python3 already uses the system libffi on all platforms. I don't know
why Python2 doesn't.
 2017-09-16 01:16:08 +03:00
Tuomas Tynkkynen
65445212df libffi: Add aarch64 patch 
This fixes pythonPackages.cffi test suite failure.
 2017-09-15 23:55:50 +03:00
Peter Simons
76519f9299 ghc-7.2.2: record the commit that broke it 
git-bisect says the problem is 51cf42ad0d.
 2017-09-15 20:52:24 +02:00
Peter Simons
d2f206c061 Merge pull request #29328 from therealpxc/tldr-hs 
haskellPackages.tldr: fix build, add as a top-level package
 2017-09-15 20:51:22 +02:00
Cray Elliott
990ea8789d zandronum: 2.1.2 -> 3.0 
remove sqlite-amalgamation and put it internal to the zandronum folder,
as it is only used by zandronum. Patches needed to avoid build impurities
and to get the correct protocol version to connect to public servers.

remove zandronum_bin as it is no longer needed
 2017-09-15 11:26:11 -07:00
Orivej Desh
604ca93182 libxml2: 2.9.4 -> 2.9.5 2017-09-15 17:28:31 +00:00
John Ericson
a31365d831 Revert "Merge commit on master into staging" 
This was reverted on master in
3510197dcc, and so needs to be reverted
here too.

This reverts commit 3befba542a, reversing
changes made to 3655e7e18b.
 2017-09-15 13:01:12 -04:00
Patrick Callahan
8119e48c2d haskellPackages.tldr: fix build and add to top-level packages 2017-09-15 09:51:37 -07:00
Patrick Callahan
12aa8b2f2b shell-conduit: disable tests on Darwin to fix build 2017-09-15 09:51:36 -07:00
Joachim Fasting
42f2439228
pharo-launcher: fix build 
As noted by @dtzWill at https://github.com/NixOS/nixpkgs/pull/26924/files#r126686231
 2017-09-15 18:47:39 +02:00
Peter Simons
3510197dcc Revert "haskell infra, ghc: Slight cleanup" 2017-09-15 18:45:15 +02:00
John Ericson
3befba542a Merge commit on master into staging 
Doing this surgically so a future PR has a readable diff.
 2017-09-15 12:13:09 -04:00
John Ericson
2295533f43 Merge pull request #29424 from obsidiansystems/slight-haskell-cleanup 
haskell infra, ghc: Slight cleanup
 2017-09-15 12:12:47 -04:00