John Ericson
f83bf0e79d
Merge pull request #34170 from dtzWill/fix/flex-cross
...
flex: fix for cross
2018-01-22 20:11:03 -05:00
John Ericson
a959e60f8a
Merge pull request #34176 from dtzWill/fix/cross-misc-3
...
Misc cross fixes
2018-01-22 19:47:52 -05:00
Will Dietz
cafe25224f
flex: review feedback
...
* top-level attributes, not crossAttrs
* use depsBuildBuild
2018-01-22 18:44:42 -06:00
John Ericson
796e2e8c75
Merge pull request #34177 from dtzWill/fix/llvm-remove-unneeded-deps
...
llvm-{4,5}: remove perl, groff -- not needed
2018-01-22 19:26:29 -05:00
Will Dietz
973d4f5354
clang-{4,5}: prefer python3, much friendlier for cross
2018-01-22 17:31:37 -06:00
Will Dietz
7e52676240
llvm-{4,5}: remove perl, groff -- not needed
2018-01-22 17:29:14 -06:00
Will Dietz
60d5e68a25
libedit: disable workaround for non-sandbox, avoid false groff dep
2018-01-22 17:24:53 -06:00
Will Dietz
4e80b56c3c
bootstrapped-pip: fix for cross (nativeBuildInputs)
2018-01-22 17:19:03 -06:00
Will Dietz
e33499bd30
python setuptools: fix for cross (nativeBuildInputs)
2018-01-22 17:19:02 -06:00
Will Dietz
67be78f129
flex: patch around attempt to regen manpage, fix cross
2018-01-22 16:51:31 -06:00
Ben Gamari
715fcb4266
flex: Don't disable static while cross-compiling flex
...
linux-pam appears to rely on this while cross-compiling.
(cherry picked from commit 4009dd163ac30cd25833bf7eb19b5e26e75c474f)
2018-01-22 16:51:30 -06:00
Ben Gamari
e6f9e82ee4
flex: Use native dependencies where applicable
...
Flex needs both a C compiler for the build environment, as well as a native m4.
(cherry picked from commit 81827c0084c1a69e41894a4d38b0c0b267eaff34)
2018-01-22 16:51:30 -06:00
John Ericson
a3bff14dbe
Merge remote-tracking branch 'upstream/master' into staging
2018-01-22 16:20:24 -05:00
John Ericson
ec0c4802ae
Merge pull request #26799 from obsidiansystems/cross-haskell
...
haskell infra: Fix cross compilation to work with new system
2018-01-22 15:31:19 -05:00
Daiderd Jordan
a786218b9d
Merge branch 'master' into staging
2018-01-22 20:55:37 +01:00
Daiderd Jordan
7c84ddb7a4
Merge pull request #34158 from LnL7/cffi-clang
...
python-cffi: fix clang build
2018-01-22 20:54:06 +01:00
Jörg Thalheim
3e1dd9215f
Merge pull request #34151 from WilliButz/update-deis
...
deis: 1.13.3 -> 1.13.4
2018-01-22 19:17:59 +00:00
Will Dietz
bd67bf5ca0
julia-git: mark broken, hasn't built since 2017-04-08. ( #34150 )
...
* julia-git: mark broken, hasn't built since 2017-04-08.
First broken: https://hydra.nixos.org/build/51447624
Last successful: https://hydra.nixos.org/build/51385779
cc #34135
2018-01-22 19:07:03 +00:00
Daiderd Jordan
505c82efe4
python-cffi: add lnl7 to maintainers
2018-01-22 19:58:15 +01:00
Daiderd Jordan
0c27903ac0
python-cffi: remove patch for clang
...
Builds fine without it now.
2018-01-22 19:45:40 +01:00
WilliButz
c8d5121c1d
deis: 1.13.3 -> 1.13.4
2018-01-22 18:59:13 +01:00
Frederik Rietdijk
6b0873440b
Merge remote-tracking branch 'upstream/master' into HEAD
2018-01-22 16:09:11 +01:00
Frederik Rietdijk
4c88132d25
Merge commit 'a0f8e3a' into HEAD
2018-01-22 16:08:37 +01:00
Tuomas Tynkkynen
73695300bc
patchelfUnstable: Fix hash
2018-01-22 11:00:29 +02:00
Vladimír Čunát
246ba46db7
Merge older staging (finished on Hydra)
...
https://hydra.nixos.org/eval/1427837?filter=&compare=1427817
Fixes #34087 .
2018-01-22 08:54:37 +01:00
Peter Simons
699d715f24
haskell-nix-paths: fix bogus dependencies
2018-01-22 08:47:00 +01:00
Ben Gamari
bf687907d7
haskell lib: Make Cabal compiler names explicit
...
Cabal2nix expects a --compiler flag that contains a Cabal Compiler description.
We used to use the compiler's derivation name for this, but this breaks when
cross-compiling due to the target suffix. Instead we add an explicit
haskellCompilerName attribute to Haskell compiler derivations.
2018-01-21 23:31:05 -05:00
John Ericson
81553124cf
haskell infra: nativeGhc != ghc.bootPkgs.ghc
...
There's no reason to wait for non-binary native to *build* cross ghc,
but we want a nix-built GHC for Setup.hs or things won't work.
2018-01-21 23:31:04 -05:00
John Ericson
8560c025bc
ghc 8.4.1: Reformat to move rev into src
2018-01-21 23:31:04 -05:00
John Ericson
a2516efb26
ghcHEAD: Bump version ghc-8.5.20180118
2018-01-21 23:31:04 -05:00
John Ericson
23c29ebc90
ghc 8.2.2: Add bgamari's STRIP detection fix
2018-01-21 23:31:04 -05:00
John Ericson
60f45a2af1
ghc 8.0.2: Patch Cabal so --extra-*-dirs works right
2018-01-21 23:31:04 -05:00
Ben Gamari
af03b7746a
ghc 8.2.2 & head: Work around ARM bugs in BFD ld by using gold
2018-01-21 23:31:03 -05:00
Ryan Trinkle
bd0de2f1cb
ghc: Fix env vars and configure flags to be weird
...
GHC currently handles this stuff in a quite non-standard way, basically
taking prog var `FOO` to mean `FOO_FROM_TARGET`. It's because it
(wrongly) thinks from stage 2's perspective.
2018-01-21 23:31:03 -05:00
John Ericson
e760de8108
ghc: Predicate libiconv on not using glibc instead of Darwin
2018-01-21 23:31:03 -05:00
John Ericson
398ac54593
ghc: Fix cross compilation to work with new system
2018-01-21 23:31:03 -05:00
John Ericson
bc16cfc009
ghc: Remove old cross work
...
That way the next commit can apply a similar diff to each GHC.
2018-01-21 23:31:02 -05:00
John Ericson
54ead73271
generic-builder: Make GHC a proper dependency
...
Rather than just sticking it on the PATH
2018-01-21 23:27:38 -05:00
John Ericson
0eb3acaf38
ghc: echo -n
mk/build.mk to avoid extra line
2018-01-21 23:27:38 -05:00
John Ericson
5a6b6b4ac5
ghc: Normalize derivations a bit before cross
...
These changes will affect the final derivation
2018-01-21 23:27:38 -05:00
Herwig Hochleitner
7706f38a6c
patchelfUnstable: 0.10-pre-20160920 -> 0.10-pre-20180108
2018-01-22 02:16:29 +01:00
Jörg Thalheim
d60c026e54
Merge pull request #34104 from yegortimoshenko/20180121.132611/gumbo
...
libgumbo: rename to gumbo
2018-01-21 22:58:39 +00:00
Jörg Thalheim
6daf8f29c4
Merge pull request #34117 from flokli/bpython-pypi
...
bpython: fetch from PyPi
2018-01-21 22:34:41 +00:00
Florian Klink
71c9ee7f9d
bpython: fetch from PyPi
...
0.17 recently got released on PyPi
2018-01-21 22:02:05 +01:00
Michael Weiss
58e78238e7
Merge pull request #33931 from dotlambda/multidict
...
pythonPackages.multidict: 3.3.2 -> 4.0.0
2018-01-21 21:12:46 +01:00
Daiderd Jordan
82de183455
Merge pull request #34088 from LnL7/xcbuild-platform-version
...
xcbuild: platform version
2018-01-21 20:50:20 +01:00
Nicolas Mattia
1d47908879
gpp: init at 2.25 and add @nmattia as maintainer ( #34098 )
...
* maintainers: add nmattia
* gpp: init at 2.25
GPP is a handy preprocessing tool, not yet present in the package set.
2018-01-21 19:17:31 +00:00
Peter Simons
4532826e99
Merge pull request #34037 from ElvishJerricco/fix-ghcjs-lts-10
...
Fixed GHCJS
2018-01-21 19:55:25 +01:00
Jörg Thalheim
9858950687
Merge pull request #34069 from lukeadams/phantomjs-headless-fix
...
phantomjs2: set QT_QPA_PLATFORM to allow use in daemons
2018-01-21 17:36:26 +00:00
Vladimír Čunát
720f498d7a
gtk2: 2.24.31 -> 2.24.32 (maintenance)
2018-01-21 16:13:03 +01:00