Commit graph

124472 commits

Author SHA1 Message Date
John Ericson
6bdf9a7f6d ghcWithPackages: Don't bother with ignoreCollisions cause we don't use buildEnv
SymlinkJoin doesn't know or care about this.
2018-01-04 11:45:36 -05:00
John Ericson
0e23478a7e Merge commit '9361b7eb85045c7e7dd20d2ddd716a9d10bf4bd4' into ericson2314-cross-base 2018-01-03 17:20:40 -05:00
John Ericson
3fb5fd0060 ghc: Normalize derivations in hash-preserving ways 2018-01-03 17:04:19 -05:00
John Ericson
0df29e1259 ghc: Noramlized source URLs 2018-01-03 17:04:19 -05:00
Bojan Nikolic
35462db2e3 Correct boost configure phase when enablePython is false
The bootstrap script does not seem to have --without-python; instead
just omit --with-python option
2018-01-03 16:57:49 -05:00
John Ericson
5e31e828f8 ghcWithPackages: Fix cross, and avoid needless C compiler 2018-01-03 01:24:57 -05:00
John Ericson
bc066466fb haskell generic-builder: Don't use absolute path to tools, and also track strip 2018-01-02 21:04:14 -05:00
John Ericson
faa4b45a1e ghc 8.2.2, head: Inline common* bindings
Cross case purposely changed as it will be rewritten anyways. But no
native hashes should be changed.
2018-01-02 21:00:23 -05:00
John Ericson
a224dfc253 haskell infra: Fix cross as much as possible without changing hashes 2018-01-02 21:00:13 -05:00
John Ericson
a5cc983c45 ghc: Clean up, and add passthru.targetPrefix, in preparation for cross
No hashes should be changed.
2018-01-02 19:50:38 -05:00
John Ericson
e3993464d9 Merge commit 'db475df127f8c82853181c46501c142ff020c3d8' into ericson2314-cross-base 2018-01-02 19:50:28 -05:00
Bojan Nikolic
00b038a3f8 boost: Do not force numpy support from 1.65
The reason is that if cross compiling (or for other reasons) python
bindings as a whole are turned off. Those two lines then trigger
assertion errors unless manually overridden for cross compilation.

This way:

 1. The `enableNumpy` default respects the `enablePython deafult.
 2. Cross works by default
 3. Absurd manual overrides still break as they should
 4. The `>= 1.65` logic is direct and not a maintaince gotcha.
2018-01-02 19:31:25 -05:00
Bojan Nikolic
db475df127 mingw-w64-pthreads: The C compiler is needed
It was a copy and paste error from the headers derivation. Also test in
release-cross.
2018-01-02 19:01:18 -05:00
John Ericson
cb8349f59f Merge branch 'pharo' into ericson2314-cross-base 2018-01-02 18:59:21 -05:00
Drew Hess
9361b7eb85
ghc: bootstrap 8.2.2 with 8.2.1-binary. 2018-01-02 12:15:16 -08:00
Ryan Trinkle
f1a6fa6eec
Merge pull request #32258 from ryantrinkle/add-nat-extraCommands
nat: add extraCommands option
2018-01-02 14:32:42 -05:00
John Ericson
ab651d2c9b linux bootstrap tools: Use same derivation whether cross compiling or not 2018-01-02 13:52:41 -05:00
Daiderd Jordan
1531fd7351
pharo: disable on darwin 2018-01-02 19:19:37 +01:00
Frederik Rietdijk
58f9fd64ef
Merge pull request #33338 from matthiasbeyer/update-toot
toot: 0.15.0 -> 0.16.2
2018-01-02 19:19:16 +01:00
Frederik Rietdijk
804285f589 Merge remote-tracking branch 'upstream/staging' into HEAD 2018-01-02 19:10:45 +01:00
Matthias Beyer
b222e44f0a toot: 0.15.0 -> 0.16.2 2018-01-02 19:06:21 +01:00
Yegor Timoshenko
63c1a54257
Merge pull request #33213 from wchresta/master
steam: add wrapper testing for libGL
2018-01-02 21:03:28 +03:00
Uli Schlachter
5465d6f7de awesome: Use --search instead of $LUA_PATH/$LUA_CPATH
Instead of polluting the environment with environment variables which
are inherited by processes spawned from awesome, use the command line
argument "--search" to add things to the search path.

cc #33169
2018-01-02 17:24:56 +00:00
Peter Simons
c98eb9e9b9
Merge pull request #33333 from shlevy/haskell-internal-libs-darwin
haskell: Fix depending on libs with internal libs on darwin.
2018-01-02 17:41:39 +01:00
Shea Levy
34a91b7922
haskell: Fix depending on libs with internal libs on darwin.
Thanks to @hamishmack for the pointer.

Fixes #33149.
2018-01-02 11:37:54 -05:00
Jörg Thalheim
bc5bf95858
Merge pull request #33279 from lopsided98/go-stdenv-shell
go-1.8, go-1.9: use stdenv.shell instead of /usr/bin/env bash
2018-01-02 16:21:41 +01:00
Jörg Thalheim
e9d5c55d01
Merge pull request #33260 from lopsided98/jemalloc-thp
jemalloc: disable transparent hugepages by default on ARMv6/7
2018-01-02 16:18:26 +01:00
John Ericson
1ecebbd939
Merge pull request #33240 from velovix/master
lxterminal: init at 0.3.1
2018-01-02 10:05:28 -05:00
Jörg Thalheim
02e95ea0b5 jemalloc: do not expose hugepage support as an option
The only common use case so far seems ARMv6/ARMv7 support.
The way this option is exposed might collide with a package with the
same name. Also the option naming on its own is not self-descriptive
without context.
2018-01-02 15:25:06 +01:00
Jörg Thalheim
310ad4345b
Merge pull request #30686 from gnidorah/keyring
pam: add optional pam_gnome_keyring integration
2018-01-02 14:58:45 +01:00
Jörg Thalheim
9057682839
Merge pull request #33301 from adisbladis/openexr-2_2_1
openexr: 2.2.0 -> 2.2.1
2018-01-02 14:45:39 +01:00
Jörg Thalheim
57a67a458f
Merge pull request #33316 from vdemeester/init-gauge
gauge: init at 0.9.6
2018-01-02 14:18:53 +01:00
Jörg Thalheim
c43b166daf
Merge pull request #33305 from adisbladis/zmq-4_2_3
zeromq: 4.2.2 -> 4.2.3
2018-01-02 14:12:39 +01:00
Michele Guerini Rocco
25b7008520 qutebrowser: make gstreamer and pdfjs configurable (#33074)
qutebrowser: make gstreamer and pdfjs configurable
2018-01-02 07:15:20 -05:00
Peter Simons
ed1bd10359
Merge pull request #33328 from dhess/ghc-arm-platforms
ghc: add ARM variants to meta.platforms for new binary versions.
2018-01-02 13:09:33 +01:00
Drew Hess
1e137832b8
ghc: add ARM variants to meta.platforms for new binary versions. 2018-01-02 03:57:12 -08:00
Peter Simons
6ad2c20bd4
Merge pull request #33327 from dhess/armv7l-ghc-fix
ghc: fix armv7l-linux support in new binary versions.
2018-01-02 12:47:16 +01:00
Peter Simons
81581ba381 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7.2 from Hackage revision
d8aa793b33.
2018-01-02 12:44:26 +01:00
Drew Hess
9c91d0d63c
ghc: fix armv7l-linux support in new binary versions. 2018-01-02 03:36:42 -08:00
Eelco Dolstra
e4beb97b9c
brotli: Use multiple outputs 2018-01-02 12:00:39 +01:00
adisbladis
aa0d820793
Merge pull request #33317 from Ma27/update-yabar
yabar-unstable: 2017-10-12 -> 2018-01-02
2018-01-02 11:47:47 +01:00
adisbladis
0dd3de2765
Merge pull request #33325 from vdemeester/init-goconvey
goconvey: init at 1.6.3
2018-01-02 11:40:52 +01:00
adisbladis
37b76f9d1e
Merge pull request #33319 from vdemeester/update-skopeo
skopeo: 0.1.23 to 0.1.27
2018-01-02 11:33:10 +01:00
adisbladis
d7ab19d9c0
delve: Build on darwin 2018-01-02 11:23:00 +01:00
Vincent Demeester
deb7841016
goconvey: init at 1.6.3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-01-02 11:19:41 +01:00
adisbladis
3804ca5648
Merge pull request #33320 from vdemeester/update-delve
delve: 0.12.1 -> 0.12.2
2018-01-02 11:18:31 +01:00
adisbladis
e2a5426be9
Merge pull request #33323 from vdemeester/update-godef
godef: 20160620-ee532b9 -> 20170920-b692db1
2018-01-02 11:16:42 +01:00
adisbladis
d17d9458d9
Merge pull request #33322 from vdemeester/update-vndr
vndr: 20170511-0cb33a0 -> 20171005-b57c579
2018-01-02 11:16:24 +01:00
Vincent Demeester
cd30356b2e
godef: 20160620-ee532b9 -> 20170920-b692db1
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-01-02 10:57:05 +01:00
adisbladis
2e00e2b276
taglib: Fix CVE-2017-12678 2018-01-02 10:53:35 +01:00