Commit Graph

4817 Commits

Author SHA1 Message Date
volth
45121d9dfc
Merge branch 'master' into oracle-jdk-remove-redundand-asserts 2017-12-13 07:02:42 +00:00
Graham Christensen
105d9519c1
Merge remote-tracking branch 'origin/master' into staging 2017-12-12 20:06:36 -05:00
Graham Christensen
e5629dc51a
Merge pull request #32365 from vcunat/p/check-meta
check meta, treewide
2017-12-12 18:55:23 -05:00
Vladimír Čunát
3a110ea3f9
treewide platform checks: abort -> throw
They aren't meant to be critical (uncatchable) errors.
Tested with nix-env + checkMeta:
[ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
2017-12-12 18:08:10 -05:00
Vladimír Čunát
c2b679516f
Merge branch 'master' into staging 2017-12-12 21:08:16 +01:00
Joachim F
1354099daf
Merge pull request #32189 from yrashk/ats2-0.3.7
ats2: 0.3.0 -> 0.3.7
2017-12-11 23:27:27 +00:00
Orivej Desh
7d14f812ab mono50: disable parallel building 2017-12-11 10:46:15 +00:00
zimbatm
6371439e0b lazarus: 1.6.0-0 -> 1.8.0 2017-12-11 10:33:39 +00:00
Vladimír Čunát
e9c12f6936
Merge older staging
There are some regressions, but not that many and I want
the security update of openssl fast.
2017-12-11 09:49:56 +01:00
John Ericson
9f1ab7cac7
Merge pull request #32549 from obsidiansystems/gcc-without-lib-output
gcc: Don't choke if there is no lib output
2017-12-10 18:55:42 -05:00
John Ericson
4e4520a0f3 gcc: Don't choke if there is no lib output 2017-12-10 17:36:15 -05:00
Orivej Desh
dd604d575f Merge branch 'master' into staging
* master: (39 commits)
  pythonPackages: rename dns -> dnspython
  awesome: fix LUA_PATH/LUA_CPATH to lgi [now for version 3.5]
  qt4: fix qmake on darwin and delete custom install phase
  python.buildEnv: always include the $out output
  nix-bash-completions: lazy load aware install
  borg: 1.1.1 -> 1.1.3
  nixos/programs/bash: document that /etc/bash_completion.d is obsolete
  ocamlPackages.markup: 0.7.4 -> 0.7.5
  hhvm: 3.21 -> 3.23.2
  ocamlPackages.ulex: 1.1 -> 1.2
  notmuch: 0.25.2 -> 0.25.3
  gmime3: 3.0.1 -> 3.0.5
  qt4: fix darwin install phase
  nixos/programs/bash: Let bash-completion lazy load scripts
  Revert "gmime: 3.0.1 -> 3.0.5"
  rawtherapee: delete unused files
  pythonPackages: rename dns -> dnspython
  nixpkgs: remove sqlite/kyotocabinet deps for leveldb
  tor-browser-bundle-bin: 7.0.10 -> 7.0.11
  networkmanager: remove restart after suspend from resume
  ...
2017-12-10 15:24:30 +00:00
Orivej Desh
166536e152
Merge pull request #32535 from Gerschtli/update/hhvm
hhvm: 3.21 -> 3.23.2
2017-12-10 11:50:41 +00:00
Tobias Happ
d5d7220770 hhvm: 3.21 -> 3.23.2 2017-12-10 11:50:15 +00:00
Vincent Laporte
d98d944d5d
Merge pull request #32494 from mpickering/ber-metaocaml2
ber_metaocaml: (re)init at 104
2017-12-10 12:36:30 +01:00
Orivej Desh
926aaa4870
Merge pull request #32215 from dtzWill/feature/clang-multilib
multilib-capable clang, multilib tests
2017-12-09 21:41:54 +00:00
Vladimír Čunát
2309acf723
Merge branch 'master' into staging 2017-12-09 21:00:07 +01:00
Peter Simons
73d85455e4
Merge pull request #32503 from mpickering/ghc-head-updates-8.5
ghcHEAD: 8.3.20170808 -> 8.5.20171209
2017-12-09 19:27:04 +01:00
Matthew Pickering
9a072a466c Remove broken ber-metaocaml-003 attribute 2017-12-09 12:18:06 +00:00
Matthew Pickering
08dfb95673 ber_metaocaml: (re)init at 104 2017-12-09 12:18:05 +00:00
dywedir
b53567e78f ocamlPackages.reason: 3.0.3 -> 3.0.4 2017-12-09 12:42:56 +01:00
Matthew Pickering
e7a327da5c ghcHEAD: 8.3.20170808 -> 8.5.20171208 2017-12-09 11:04:31 +00:00
Orivej Desh
0a41fc6b7c mono46, mono48: disable parallel building
See #32386
mono46: https://hydra.nixos.org/build/65617511
mono48: https://hydra.nixos.org/build/65600645
2017-12-09 10:53:16 +00:00
Joachim F
f5f6d8e393
Merge pull request #32481 from ThomasMader/dlang
dmd, ldc, dub: Inherit buildInput and meta from build derivation
2017-12-08 23:50:33 +00:00
John Ericson
0271644491
Merge pull request #32403 from obsidiansystems/gcc-modernize-builder
gcc: Modernize builder
2017-12-08 14:42:10 -08:00
Thomas Mader
b2e76afa99 dmd, ldc, dub: Inherit buildInput and meta from build derivation 2017-12-08 22:12:11 +01:00
Vladimír Čunát
cdde22aef5
Merge branch 'staging' (older one) 2017-12-08 10:22:31 +01:00
Austin Seipp
90bcfc78c3 nixpkgs: no parallel builds for mono 4.4
See #32386 -- while Mono in general should build correctly with parallel
building, it seems the 4.4 branch has broken.

Instead, allow parallel build support to be overridden by individual
versions, and default to true.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-12-07 17:30:27 -06:00
Vladimír Čunát
6f5d989478
treewide: checkMeta fixes for x86_64-linux 2017-12-07 07:50:47 -05:00
Jörg Thalheim
2b91fc0c24
Merge pull request #32402 from volth/oraclejdk8-fix-arm-hashes
oraclejdk8: fix armv7l hashes
2017-12-07 10:10:56 +00:00
John Ericson
a1e1e437df Merge branch 'master' into staging
Need base branch for GCC PR
2017-12-07 02:22:27 -05:00
John Ericson
3afe325a3e Merge commit '43d5c5d6db3ce33f3cf1d17ba43c7374257466ec' into gcc-modernize-builder 2017-12-07 02:19:04 -05:00
John Ericson
e82bd498d1 Merge commit '992bd2f6d34b2f560fc17df6fa3708fcade1abac' into gcc-modernize-builder 2017-12-07 02:13:24 -05:00
John Ericson
3a59cd87f2 Merge commit '93cd0685c5ac4d8f21d8586d3e5c45cd7394fab9' into gcc-modernize-builder 2017-12-07 01:49:31 -05:00
John Doe
2394c40fc0 oraclejdk8: fix armv7l hashes 2017-12-07 06:44:44 +00:00
John Ericson
51948eab94 gcc: Fix after merge
- NIX_CC_CROSS is now completely gone!

- NIX_CC is defined reliably, so no manual def needed

- stdenv.ccCross -> stdenv.cc, also removing need for "or" fallback
2017-12-07 01:42:43 -05:00
John Ericson
974b9201a5 Merge commit 'c9ca54199409324101bdee38f5b16e7656a16a22' into gcc-modernize-builder 2017-12-07 01:42:35 -05:00
John Ericson
cc20d402d4
Merge pull request #32361 from obsidiansystems/gcc-simplify-flags
gcc: Simplify configure flags
2017-12-07 00:59:49 -05:00
Austin Seipp
44ce034bfb nixpkgs: arachne-pnr 2017.11.05 -> 2017.12.06
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-12-06 22:05:50 -06:00
Austin Seipp
f284f04a74 nixpkgs: yosys 2017.11.05 -> 2017.12.06
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-12-06 22:04:49 -06:00
John Ericson
d96cf0f46c gcc: Handle CPATH and LIBRARY_PATH purely in Nix 2017-12-06 19:12:51 -05:00
John Ericson
d4595b38e9 gcc: Modernize builder.sh for Cross
Instead of `NIX_CC` vs `NIX_CC_CROSS` spagetti, unconditionally use
`NIX_BUILD_CC` and `NIX_CC` in a consistent manner.
2017-12-06 19:12:50 -05:00
Piotr Bogdan
391485e3b3 mono: re-enable parallel building 2017-12-06 14:34:11 +00:00
John Doe
683337d5f5 oraclejdk: remove redundant asserts 2017-12-06 07:43:22 +00:00
Vladimír Čunát
9ab5848335
Merge branch 'master' into staging
Haskell updates.  Hydra: ?compare=1416248
2017-12-06 02:23:46 +01:00
John Ericson
43d5c5d6db Merge commit '703a9f93c1254f7bdf0350ca0462de0d78033c62' into gcc-simplify-flags 2017-12-05 17:58:16 -05:00
John Ericson
992bd2f6d3 Merge commit 'ab77a6bb1e7d2ff475210ad392f1a9bd1bb6ba3a' into gcc-simplify-flags 2017-12-05 17:41:15 -05:00
John Ericson
93cd0685c5 Merge commit '71186e73455a4e06e96a31da34b76f84e545ba1f' into gcc-simplify-flags 2017-12-05 17:09:41 -05:00
John Ericson
c9ca541994 Merge commit '198dceccbe5414a5fd72ca83624c0cc715db1aad' into gcc-simplify-flags 2017-12-05 16:55:11 -05:00
Michael Raskin
b04040cce4
Merge pull request #32329 from fare-patches/gerbil
Gerbil
2017-12-05 21:23:39 +00:00
John Ericson
a3e35fbbe1 gcc: Use platformFlags in crossConfigureFlags
A nice code deduplication
2017-12-05 14:01:18 -05:00
John Ericson
1fe9798ac2 lib, gcc: No inherit (platform) gcc; in {host,build,target}Platform 2017-12-05 13:52:20 -05:00
John Doe
f38560a17b oraclejdk8: support aarch64
[dezgeg amended the change to all-packages.nix]
2017-12-05 15:48:25 +02:00
Will Dietz
9d8f9b2e53 Add clang multilib variants (x64_64-only, 64/32bit), basic multilib tests 2017-12-05 07:17:14 -06:00
Vladimír Čunát
689d6303e8
Merge branch 'master' into staging
The haskell split got reverted (again).
Hydra: ?compare=1416012
2017-12-05 13:07:26 +01:00
Peter Simons
8d8061ec20
Revert "Revive multiple outputs for Haskell packages." 2017-12-05 09:36:08 +01:00
Francois-Rene Rideau
62935172f3 gerbil: 0.12-DEV-777-gd855915 -> 0.12-DEV-836-gcde6802 2017-12-04 23:46:39 -05:00
John Ericson
74cbb5796e gcc: Get rid of crossAttrs.configureFlags 2017-12-04 20:50:59 -05:00
Joachim F
c0d7a054cb
Merge pull request #32274 from ThomasMader/dlang
Improve dlang packages
2017-12-04 23:02:11 +00:00
John Ericson
cabfe1885f gcc: Don't try to enable plugins with host != build 2017-12-04 16:27:18 -05:00
John Ericson
2fdca4db69 gcc: Lock down more tools for cross-builds
That is, build != host == target
2017-12-04 16:27:18 -05:00
Orivej Desh
59bcd86640 Merge branch 'master' into staging
* master: (53 commits)
  hashcat: 4.0.0 -> 4.0.1
  vault: add nixos test
  emem: 0.2.48 -> 0.2.50
  nixos/nat: add dmzHost option (#32257)
  vulnix: 1.3.4 -> 1.4.0
  linux-4.13: mark as insecure (+required generic changes)
  vault: 0.8.3 -> 0.9.0
  gox: 20140904 -> 0.4.0
  guitarix: 0.35.6 -> 0.36.1
  geolite-legacy: 2017-10-25 -> 2017-12-02
  premake5: 5.0.0pre.alpha.11 -> 5.0.0-alpha12
  otfcc: build with ninja
  python/hetzner: 0.7.5 -> 0.8.0
  linux-testing: 4.15-rc1 -> 4.15-rc2
  Revert "linux_4_13: Remove, no longer supported."
  jenkins: 2.92 -> 2.93
  psc-package: 0.2.4 -> 0.2.5
  dino: 2017-09-26 -> 2017-12-03
  gnome3.gpaste: fix keybindings path
  plasma: 5.11.3 -> 5.11.4
  ...
2017-12-04 15:25:34 +00:00
Peter Simons
7993e8790f
Merge pull request #32112 from nc6/hask-split-out
Revive multiple outputs for Haskell packages.
2017-12-04 12:36:45 +01:00
Tomasz Rybarczyk
911dd477fb psc-package: 0.2.4 -> 0.2.5 2017-12-04 00:11:27 +01:00
WilliButz
adf032ba46
nasm: 2.13.01 -> 2.13.02 2017-12-03 16:00:19 +01:00
Thomas Mader
66860af01a ldc: 1.3.0 -> 1.5.0
- Bootstrap with ldc lts (0.17.5) instead of dmd.
- Enable unittests by using a fixed-output derivation for runtime tests.
2017-12-03 11:41:39 +01:00
Orivej Desh
ecd0e11851 neko: enable check phase 2017-12-03 10:30:08 +00:00
Thomas Mader
54f1b753b3 dmd: Enable tests and integrate bootstrap into one derivation
- Merge bootstrap dmd into default derivation.
- Reenable all tests by using a fixed-output derivation for phobos tests because of network checks in sandbox mode.
- Adding supported platforms.
2017-12-03 05:18:57 +01:00
Tuomas Tynkkynen
58307d15a7 Merge remote-tracking branch 'upstream/staging' into master 2017-12-03 01:49:14 +02:00
Tuomas Tynkkynen
491e5d8649 rustc: Support aarch64 2017-12-02 14:46:33 +02:00
Michael Fellinger
94b7925b30 elm-interface-to-json: init at 0.1 (#32194)
elm-interface-to-json -> init at 0.1
2017-12-02 13:32:45 +01:00
Orivej Desh
4a7a497fb6 go: add procps for sysctl in tests, print ulimits for debugging resource exhaustion 2017-12-02 12:19:14 +00:00
Vladimír Čunát
33300c7316
Merge branch 'master' into staging
Hydra: ?compare=1415329
2017-12-02 09:37:07 +01:00
Tomas Hlavaty
eefe8271af sbcl: 1.4.1.0.20171104 -> 1.4.2 2017-12-01 20:43:11 +01:00
Tomas Hlavaty
89f61b3339 ccl: 1.11 -> 1.11.5 2017-12-01 20:31:47 +01:00
Vladimír Čunát
9f8c3f77ea
Merge branch 'master' into staging
Hydra: ?compare=1415011
2017-12-01 09:18:58 +01:00
Vladimír Čunát
b4ec153040
orc: doCheck broken on i686 on Hydra, again 2017-12-01 07:49:25 +01:00
Orivej Desh
e1757f6a24 julia: do not print environment before testing 2017-12-01 00:05:26 +00:00
Yurii Rashkovskii
a83067ea9e ats2: 0.3.0 -> 0.3.7
The patch is no longer needed as ats2 includes contribs in the
upstream Makefile_dist file
2017-11-30 13:09:50 +07:00
Tuomas Tynkkynen
703a9f93c1 gcc6: Restore missing platform flags
This was missed in commit 1c1207220f
("gcc: Refactor treatment of configure flags"), all other GCC versions
have it right.
2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
0f249a7354 gccSnapshot: Reduce diff to gcc7 2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
d7a0695c43 gcc7: Reduce diff to gcc6 2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
825b953bf5 gcc48: Reduce diff to gcc49 2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
77b409b2cf gcc49: Reduce diff to gcc5 2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
aa3d195a30 gcc5: Reduce diff to gcc6 2017-11-29 23:09:16 +02:00
Jason Felice
ed38976d9a chez: support Darwin 2017-11-29 19:26:13 +00:00
Tuomas Tynkkynen
fc26ff04b2 llvm: Include aarch64 patch in repo
The URL is already a dead link.
2017-11-29 17:01:17 +02:00
Peter Simons
b58cb3fa28 ghc-8.2.2: drop obsolete gold linker patch
Pointed out by @basvandijk in b1a0f91afe.
2017-11-29 10:47:08 +01:00
Vladimír Čunát
8b53b2ec2c
Merge branch 'master' into staging 2017-11-28 21:06:44 +01:00
dywedir
fb6f204813 ocamlPackages.reason: 3.0.2 -> 3.0.3 2017-11-28 20:28:43 +02:00
Vladimír Čunát
addd20e6f9
Merge branch 'master' into staging 2017-11-28 18:19:34 +01:00
Tuomas Tynkkynen
0ea6ab8097 llvm_{4,5}: Add Aarch64 patch
https://reviews.llvm.org/D40423
2017-11-28 14:51:40 +02:00
Orivej Desh
7f8bc042cc obliv-c: fix build with glibc 2.26
by ignoring unavoidable but unneeded _Complex and __float128 keywords.

Upstream issue: https://github.com/samee/obliv-c/issues/48
2017-11-28 11:10:44 +00:00
Vladimír Čunát
853dd191e2
orc: maintenance 0.4.27 -> 0.4.28
The test problems are probably gone.  Let's try it again.
2017-11-27 18:05:41 +01:00
Nicholas Clarke
d90165c7db Revert "Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out""
This reverts commit 89f5d52cf4.
2017-11-27 16:05:22 +00:00
Vladimír Čunát
6345089ca0
Merge #29392: gnome3: 3.24 -> 3.26
It might be slightly confusing that a couple of the changes will be twice
in the history, but let's merge this way.
2017-11-27 12:19:01 +01:00
Jan Tojnar
5a3b7ef2e7
gnome3: use the same version of Vala 2017-11-26 03:10:50 +01:00
Orivej Desh
29b2984b0c
Merge pull request #31987 from jtojnar/devhelp-devdoc
stdenv: Move devhelp books to outputDevdoc
2017-11-25 23:14:47 +00:00
Frederik Rietdijk
7a13e5a7df Merge remote-tracking branch 'upstream/python-unstable' into HEAD 2017-11-24 19:58:07 +01:00
Jan Tojnar
46ee9d4c34
vala: split out devdoc output 2017-11-24 02:14:13 +01:00