Commit Graph

5572 Commits

Author SHA1 Message Date
Frederik Rietdijk
48110c1295 Merge staging into master 2018-06-22 13:20:37 +02:00
John Ericson
e050011aa3
Merge pull request #42311 from obsidiansystems/haskell-enable-shared-defaults
haskell: make generic builder follow compiler’s shared config
2018-06-21 18:07:11 -04:00
Matthew Bauer
9e4aebdd7b ghc8.4: add android triple
The triple is needed for armv7a-android-prebuilt to work (partly) with
GHC.

- also set EXTRA_CC_OPTS for ghc8.2
2018-06-20 22:03:59 -04:00
Matthew Bauer
fd7a6ea0af haskell: make generic builder follow compiler’s shared config
enableShared in generic-builder.nix should default to what the GHC
compiler was compiled with. Add a passthru to all of the GHC compilers
to hold the value of enableShared. If enableShared is not set in the
GHC we just use false as the default value for enableSharedLibraries.

Note: I may have missed some compilers. Only GHC & GHCJS are covered
by this commit but this shouldn’t break evaluation of anything else.
2018-06-20 18:40:53 -04:00
Vladimír Čunát
5039d6ed1f
Merge branch 'master' into staging
~6k rebuilds per platform (mainly haskellPackages, I think).
2018-06-20 18:17:18 +02:00
Peter Simons
7283740218
Merge pull request #42123 from peti/drop-ghc-8.4.2
ghc: drop compiler version 8.4.2; we prefer 8.4.3
2018-06-19 22:35:55 +02:00
John Ericson
07ff2c27f1
Merge pull request #37598 from dtzWill/feature/ghc-cross-musl
ghc-{8.2.2,8.4.1}: fixups mostly for 2-stage cross, musl
2018-06-18 17:01:31 -04:00
Matthew Justin Bauer
30913cc998
ghcjs: remove phases
We can just disable each one we don't want manually.
2018-06-18 15:44:23 -04:00
Daiderd Jordan
a13286fcf0
Merge branch 'master' into staging 2018-06-18 17:35:00 +02:00
Jörg Thalheim
0eee2f746f
Merge pull request #41834 from manveru/crystal-2.25.0
Crystal: 0.24.2 -> 0.25.0
2018-06-18 10:10:16 +01:00
Michael Fellinger
d9428ceaf5 Mint: 0.0.3 -> 0.0.4 2018-06-17 13:03:47 +02:00
Michael Fellinger
577d54bb16 Crystal: 0.24.2 -> 0.25.0 2018-06-17 13:03:32 +02:00
Peter Simons
b0909cc394 ghc: drop compiler version 8.4.2; we prefer 8.4.3 2018-06-17 10:37:06 +02:00
Graham Christensen
cbae3d171b
vsenv, vs90wrapper: delete 2018-06-15 22:20:54 -04:00
Yegor Timoshenko
0cbb64a1e4
Merge pull request #42021 from r-ryantm/auto-update/closure-compiler
closurecompiler: 20180506 -> 20180610
2018-06-15 01:09:36 +00:00
Yegor Timoshenko
6d31412b58
Merge pull request #42018 from r-ryantm/auto-update/go
go: 1.10.2 -> 1.10.3
2018-06-15 01:07:35 +00:00
John Ericson
92cef7ad42 compiler-rt 5: Fix double space 2018-06-14 20:25:38 -04:00
John Ericson
763b0c83de
Merge pull request #42048 from obsidiansystems/llvm-5-compiler-rt
llvm 5: split out compiler-rt and remove libcxxabi dep
2018-06-14 19:50:09 -04:00
John Ericson
0e1ae4b355 Merge remote-tracking branch 'upstream/master' into staging 2018-06-14 19:42:13 -04:00
John Ericson
b2cc99ea1b
Merge pull request #42056 from obsidiansystems/llvm-6-darwin-sanitize
llvm 6: Fix libcxxabi impurity and darwin sanitizers
2018-06-14 19:39:44 -04:00
John Ericson
6e7e22da70 llvm 5: split out compiler-rt and remove libcxxabi dep
We already did them on non-mass-rebuild llvm 6. Also, this allows
simplifying the stdenv booting.

We were missing the libcxxabi dep in compile-rt in llvm 6, so fixed that
too.
2018-06-14 19:22:15 -04:00
John Ericson
fc9644d4c9 llvm 6: Fix libcxxabi impurity and darwin sanitizers 2018-06-14 19:19:54 -04:00
Matthew Justin Bauer
493ce3b2c4
Merge pull request #42050 from obsidiansystems/fix-ios-ghc
ghc8.4: build statically on prebuilt iOS
2018-06-14 17:37:06 -04:00
Matthew Bauer
3d811ff18b ghc8.4: build statically on prebuilt iOS
Otherwise we run into issues in stage 1 with libffi.dylib unable to be
built. It is probably a similar case to the prebuilt Android.

/cc @ericson2314
2018-06-14 17:31:06 -04:00
John Ericson
2c08c768ed
Merge pull request #42037 from obsidiansystems/gmp-fixes
Fixes for GMP + prebuilt mobile
2018-06-14 16:13:47 -04:00
John Ericson
bdf750499e Merge remote-tracking branch 'upstream/master' into staging 2018-06-14 15:56:00 -04:00
Matthew Bauer
7bc2024fb7 ghc8.4.3: add gmp available check
This was left out in 812decd5c1 & should
be therer.
2018-06-14 15:54:25 -04:00
John Ericson
4ad049fba0
Merge pull request #42034 from obsidiansystems/darwin-booting-llvm
darwin bootstrapping: Avoid overriding aliases for LLVM
2018-06-14 15:53:51 -04:00
John Ericson
1eacf21bd4 darwin bootstrapping: Avoid overriding aliases for LLVM
Respect the fix points and aliases by overriding originals.
2018-06-14 15:05:18 -04:00
Matthew Bauer
a9400e64e7 ghcjs: add version to haskellCompilerName
This is needed for some cabal2nix stuff in getting the version.
Previously we had left out the version but apparently this can cause
problems in some scenarios.

/cc @elvishjerricco @peti @ericson2314
2018-06-14 11:38:13 -04:00
R. RyanTM
2b9e2f5ade closurecompiler: 20180506 -> 20180610
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/closure-compiler/versions.

These checks were done:

- built on NixOS
- /nix/store/7mbi0qnqknb3z96a4af1p8wyyi0jf2q5-closure-compiler-20180610/bin/closure-compiler passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 20180610 with grep in /nix/store/7mbi0qnqknb3z96a4af1p8wyyi0jf2q5-closure-compiler-20180610
- directory tree listing: https://gist.github.com/2841b8a1c31feea2745c98e5234d70c3
- du listing: https://gist.github.com/e36999cb96d2e1b1366f7bd1c3804cad
2018-06-14 08:30:32 -07:00
R. RyanTM
fce5759f24 go: 1.10.2 -> 1.10.3
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/go/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/sz746n0jm0n8dnv47d7cqvwny8ncfbi4-go-1.10.3/bin/gofmt had a zero exit code or showed the expected version
- /nix/store/sz746n0jm0n8dnv47d7cqvwny8ncfbi4-go-1.10.3/bin/.go-wrapped passed the binary check.
- /nix/store/sz746n0jm0n8dnv47d7cqvwny8ncfbi4-go-1.10.3/bin/go passed the binary check.
- 2 of 3 passed binary check by having a zero exit code.
- 0 of 3 passed binary check by having the new version present in output.
- found 1.10.3 with grep in /nix/store/sz746n0jm0n8dnv47d7cqvwny8ncfbi4-go-1.10.3
- directory tree listing: https://gist.github.com/499abd38cfb9318ba6bbcd885951c6b8
- du listing: https://gist.github.com/04fbe15eac23c814fa6b313c8e543e4c
2018-06-14 07:59:05 -07:00
R. RyanTM
96e2be5084 pony-stable: 0.1.2 -> 0.1.3
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pony-stable/versions.

These checks were done:

- built on NixOS
- /nix/store/d6b9yh4mbc6g4ysgzzdj4xbi49cy228m-pony-stable-0.1.3/bin/stable passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.1.3 with grep in /nix/store/d6b9yh4mbc6g4ysgzzdj4xbi49cy228m-pony-stable-0.1.3
- directory tree listing: https://gist.github.com/b5577bbf57ef8fa733c1e1aee8ab8908
- du listing: https://gist.github.com/c69c238d1ab5c35fba5ade17f912bed5
2018-06-13 23:06:40 -07:00
John Ericson
cebda2ffd0 Merge remote-tracking branch 'upstream/master' into staging 2018-06-13 21:18:24 -04:00
John Ericson
7156f46949 llvm 3.8+: Remove unneeded libcxxabi dependency
Evidentally this hasn't been needed for a while
2018-06-13 21:06:00 -04:00
John Ericson
e358fff0d6 llvm: use native cmake for libc++abi
Finish what 1cb1b9193b started.
2018-06-13 21:02:04 -04:00
Matthew Justin Bauer
45c70e496f
ghcjs-ng: add haskellCompilerName attribute
This is needed by some old code in Nixpkgs. Adding it here will fix some eval errors.

/cc @ElvishJerricco

Fixes #41943
2018-06-13 16:34:50 -04:00
Will Dietz
6cc5483b5e ghc-{8.2.2,8.4.1}: fixups mostly for 2-stage cross, musl
* grab patches from gentoo to fix various 2-stage cross build system
  bugs
* explicitly set CrossCompilePrefix to the expected targetPrefix
  -- ensures everything has expected name and location
  -- fixes lack of prefix'ing when doing glibc -> musl "cross"
* Stage1Only: only set if doing "true" cross
* don't try to specify include/lib dirs for ncurses on cross
  -- only used by terminfo which actually removed the include option,
  and the lib option doesn't seem to do anything other than
  confuse the situation re:cross.

Fixes #37522
2018-06-13 14:41:12 -04:00
Orivej Desh
8e61ad2800 Merge branch 'master' into staging
* master: (33 commits)
  Revert "libxml2: add static output"
  yq: 2.5.0 -> 2.6.0 (#41926)
  yoshimi: 1.5.8 -> 1.5.8.2 (#41925)
  haskell generic-builder: Use separate setup db in more cases
  nixos/tests/morty: fix non-deterministic failure
  texlive: Fix 'match-parens' ruby dependency
  chromium: 67.0.3396.62 -> 67.0.3396.87
  ngspice: Fix regression due to missing X libs (#41890)
  mattermost-desktop: init at 4.1.1 (#40794)
  xcircuit: init at 3.9.73 (#41891)
  yarn: 1.7.0 -> 1.8.0 (#41895)
  Update default.nix (#41842)
  libxml2: add static output
  remarshal: supports darwin
  go-ethereum: 1.8.10 -> 1.8.11
  bazel: add darwin support
  llvm: use native cmake for libc++abi
  kicad-unstable: 2018-03-10 -> 2018-06-12
  cmake: Only apply application-services.patch with 3.11
  nixos/tinc: minor fixes
  ...
2018-06-13 16:09:04 +00:00
Matthew Justin Bauer
dbfab81377
Merge pull request #41900 from obsidiansystems/fix-darwin-cross
libcxxabi: use cmake as native build input
2018-06-12 20:41:06 -04:00
Matthew Bauer
1cb1b9193b llvm: use native cmake for libc++abi 2018-06-12 20:36:16 -04:00
Shea Levy
afad9983e3
rust: Fix typo in binary build comment.
Pointed out by @Havvy.
2018-06-12 19:01:24 -04:00
Orivej Desh
7f3de60758 Merge branch 'master' into staging
* master: (161 commits)
  pcsclite: clean up after #41790
  tor: 0.3.3.6 -> 0.3.3.7
  opae: init at 1.0.0
  tinc: 1.0.33 -> 10.0.34
  tinc_pre: 1.1pre15 -> 1.1pre16
  sit: 0.3.2 -> 0.4.0 (#41863)
  platforms/raspberrypi: enable kernelAutoModules
  libupnp: 1.6.21 -> 1.8.3 (#41684)
  androidStudioPackages.{dev,canary}: 3.2.0.16 -> 3.2.0.17
  tdesktop: 1.3.0 -> 1.3.7
  gns3Packages.{server,gui}{Stable,Preview}: 2.1.6 -> 2.1.7
  aws-sam-cli: init at 0.3.0 (#41877)
  nixos/nat: optional networking.nat.externalInterface (#41864)
  linux: 4.17 -> 4.17.1
  linux: 4.16.14 -> 4.16.15
  linux: 4.14.48 -> 4.14.49
  nixos/unbound: add restart (#41885)
  maintainers/create-azure.sh: remove hydra.nixos.org as binary cache (#41883)
  gshogi: init at 0.5.1 (#41840)
  neovim: add missing libiconv
  ...
2018-06-12 20:41:41 +00:00
John Ericson
812decd5c1 ghc: Default integer-simple usage based one whether GNU MP is available
The user's choice is still always respected
2018-06-11 15:51:57 -04:00
Tim Steinbach
e0d1c6315a
Merge pull request #41776 from pclewis/openjdk-jdk10-truststore-from-env
openjdk: fix truststore-from-env patch for jdk10
2018-06-11 09:35:12 -04:00
Kamil Chmielewski
0cc063ebae ponyc: 0.22.6 -> 0.23.0 (#41833)
https://github.com/ponylang/ponyc/issues/2764
2018-06-11 15:09:29 +02:00
Matthew Bauer
7eb169a257 avian: use no error
Currently a warning breaks an otherwise working package
2018-06-10 20:34:40 -04:00
mingchuan
5095e9e32e solc: 0.4.23 -> 0.4.24 (#41631)
Also enable test
2018-06-10 10:37:58 +02:00
Frederik Rietdijk
ae215d1ba8 Merge master into staging 2018-06-10 10:10:42 +02:00
Philip Lewis
129ea5ed81 openjdk: fix truststore-from-env patch for jdk10
storePropName will be jsseDefaultStore if the property isn't present, and
jsseDefaultStore is never null, so the branch to use the environment variable
would never be taken.

The env var is supposed to be preferred to jssecacerts, so we can use it as
the default in the call to System.getProperty, and use the null check to fall
back on jsseDefaultStore instead.
2018-06-09 20:20:47 -04:00