Commit Graph

129783 Commits

Author SHA1 Message Date
John Ericson
4a29081a94
Merge pull request #35071 from oxij/stdenv/infopages
stdenv, bash: fixing info pages and stuff
2018-02-26 18:06:11 -05:00
Daiderd Jordan
b4cf3f7909
Merge pull request #35349 from matthewbauer/qt5-darwin-pkgconfig
qt5: install pkg_config files on darwin
2018-02-27 00:05:56 +01:00
Jan Malakhovski
d45e39c9a9 bash, bashInteractive: install manpages for both variants
This mostly reverts commit bd0e161f0cd6a34a5fa777570b1489f1275af417.
2018-02-26 22:46:35 +00:00
Jan Malakhovski
49afe1d490 stdenv: darwin: give distinct names to all the stages 2018-02-26 22:46:34 +00:00
Jan Malakhovski
e654d9a9ca stdenv: linux: give distinct names to all the stages
Mainly for debugging.
2018-02-26 22:46:34 +00:00
Jan Malakhovski
522437362a stdenv: linux, darwin: don't build documentation for the the intermediate stages
For the cc of the intermediate stages, to be precise. Doing the same for
bintools requires lots of refactoring.

This is mainly for the future extensibility as now you can change
documentation generation with impunity without rebuilding the
whole of stdenv.
2018-02-26 22:45:10 +00:00
Jan Malakhovski
f1074211ce cc-wrapper: allow building without documentation, propagate info pages 2018-02-26 22:42:33 +00:00
Jan Malakhovski
0ab1067d12 bintools-wrapper: allow building without documentation 2018-02-26 22:42:32 +00:00
Vladimír Čunát
6168c2e45f
Merge master into staging
This is to cleanup the (re-)revert of merge to master.
2018-02-26 22:55:11 +01:00
Vladimír Čunát
e2243a5ac9
Revert "Revert "Merge staging at '8d490ca9934d0' into master""
This reverts commit f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.
2018-02-26 22:54:48 +01:00
Vladimír Čunát
f5ce8f86df
Revert "Merge staging at '8d490ca9934d0' into master"
This reverts commit fc232422201c0364dbd57826c9a137cc1239caea, reversing
changes made to 754816b84b98afdc0727e13dd66e1698b097de6a.
We don't have many binaries yet.  Comment on the original merge commit.
2018-02-26 22:53:18 +01:00
Aristid Breitkreuz
b8f4df9d9e attempt to fix #30940 more robustly 2018-02-26 22:19:12 +01:00
Peter Simons
a06b81b8ad
Merge pull request #35651 from mnacamura/r-xml2-darwin
rPackages.xml2: fix darwin build
2018-02-26 20:16:16 +01:00
Peter Simons
3e48f1ee09
Merge pull request #35653 from mnacamura/r-juniperkernel-darwin
rPackages.JuniperKernel: fix darwin build
2018-02-26 20:15:52 +01:00
Peter Simons
8c0a1c87d1
Merge pull request #35661 from deepfire/ghc-8.4
ghc841 | hpack:  SMP fix unmerged
2018-02-26 20:15:06 +01:00
Vincent Laporte
c5eeb838c8 smplayer: 17.9.0 -> 18.2.2 2018-02-26 19:52:58 +01:00
Frederik Rietdijk
b92d994501 Python: fix update script for nix 2.0 2018-02-26 18:42:49 +01:00
Frederik Rietdijk
ae18bc5913 python: xarray: 0.10.0 -> 0.10.1 2018-02-26 18:42:49 +01:00
Frederik Rietdijk
a194770585 python: SQLAlchemy: 1.2.3 -> 1.2.4 2018-02-26 18:42:49 +01:00
Frederik Rietdijk
abcb806b48 python: Sphinx: 1.7.0 -> 1.7.1 2018-02-26 18:42:49 +01:00
Frederik Rietdijk
78b3721753 python: restructuredtext_lint: 1.1.2 -> 1.1.3 2018-02-26 18:42:48 +01:00
Frederik Rietdijk
fd35c5c8fd python: regex: 2018.02.08 -> 2018.02.21 2018-02-26 18:42:48 +01:00
Frederik Rietdijk
9494156d36 python: pytest: 3.4.0 -> 3.4.1 2018-02-26 18:42:48 +01:00
Frederik Rietdijk
3bf9a5e0f9 python: pyopencl: 2018.1 -> 2018.1.1 2018-02-26 18:42:48 +01:00
Frederik Rietdijk
9d0112455a python: plotly: 2.4.0 -> 2.4.1 2018-02-26 18:42:48 +01:00
Frederik Rietdijk
ed47452739 python: pendulum: 1.4.1 -> 1.4.2 2018-02-26 18:42:48 +01:00
Frederik Rietdijk
24ee19f8a6 python: numpy: 1.14.0 -> 1.14.1 2018-02-26 18:42:48 +01:00
Frederik Rietdijk
1680228e07 python: msgpack: 0.5.4 -> 0.5.6 2018-02-26 18:42:48 +01:00
Frederik Rietdijk
b1ef93a132 python: ipykernel: 4.8.1 -> 4.8.2 2018-02-26 18:42:48 +01:00
Frederik Rietdijk
5c6d4687cf python: dask: 0.17.0 -> 0.17.1 2018-02-26 18:42:48 +01:00
Frederik Rietdijk
ca01ff1ae3 python: botocore: 1.8.45 -> 1.8.50 2018-02-26 18:42:48 +01:00
Frederik Rietdijk
006a6db012 python: behave: 1.2.5 -> 1.2.6 2018-02-26 18:42:48 +01:00
Frederik Rietdijk
2d74d853dd python: aniso8601: 2.0.0 -> 2.0.1 2018-02-26 18:42:48 +01:00
Frederik Rietdijk
319942aa65 python: aiohttp: 3.0.1 -> 3.0.3 2018-02-26 18:42:48 +01:00
Jörg Thalheim
389f2cc88c
Merge pull request #35442 from bgamari/fix-notmuch
notmuch: Fix configure invocation
2018-02-26 17:27:46 +00:00
Peter Hoeg
88b7830b82 wakeonlan: init at 1.0.0 2018-02-27 01:16:05 +08:00
Ben Gamari
5f3b59c0d0 notmuch: Fix configure invocation 2018-02-26 12:00:03 -05:00
Jörg Thalheim
02ba80a339
Merge pull request #35539 from srhb/35505
dockerTools: Pin go to 1.9
2018-02-26 16:12:41 +00:00
Peter Hoeg
a99d1f65f0 home-assistant: add missing dependencies 2018-02-26 23:46:42 +08:00
Peter Hoeg
ab6c9143c2 jsonrpc-websocket: init at 0.5 2018-02-26 23:46:42 +08:00
Peter Hoeg
48a792d707 jsonrpc-async: init at 0.6 2018-02-26 23:46:42 +08:00
Peter Hoeg
afd191adba jsonrpc-base: init at 1.0 2018-02-26 23:46:42 +08:00
Peter Hoeg
b619c9b76c pyunifi: init at 2.13 2018-02-26 23:46:42 +08:00
Pascal Wittmann
356296287d
intel-gpu-tools: 1.19 -> 1.21 2018-02-26 16:04:33 +01:00
Pascal Wittmann
7f400f4fb3
instead: 3.0.1 -> 3.2.0 2018-02-26 16:04:30 +01:00
Will Dietz
3092659d96
Merge pull request #35674 from dtzWill/fix/llvm-4-cmdline-help
llvm_4: fix cosmetic issue in help output
2018-02-26 08:57:47 -06:00
Will Dietz
435288caca llvm_4: fix cosmetic issue in help output
Can be observed in programs like "llvm-link".
2018-02-26 08:30:20 -06:00
Profpatsch
6a70e4e663 dhall: passthru dhall prelude
Makes it possible to reference `dhall.prelude`, the same version that comes with
the dhall exetutable’s source code.
2018-02-26 15:21:46 +01:00
Will Dietz
4697c980aa
Merge pull request #35672 from dtzWill/fix/libiconv-strip
libiconv: don't use deprecated crossAttrs, re-enabling cross-stripping
2018-02-26 08:09:58 -06:00
Peter Simons
0f7a7cb3d8 hackage: update db snapshot 2018-02-26 14:28:40 +01:00