3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

282 commits

Author SHA1 Message Date
John Ericson 4d2b763817
Merge pull request #26805 from obsidiansystems/cross-elegant
Make cross compilation elegant
2017-12-30 22:58:02 -05:00
John Ericson 046f091e0d treewide: Don't use envHook anymore
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
2017-12-30 22:04:22 -05:00
Daiderd Jordan c8080388d8
libresolv: fix library version 2017-12-27 18:41:31 +01:00
John Ericson a0b1ebeee9 Merge remote-tracking branch 'upstream/staging' into binutils-wrapper 2017-12-13 16:14:47 -05:00
John Ericson cebe1b4c08 darwin binutils: Better handling of man pages and info 2017-12-13 16:08:18 -05:00
John Ericson 2bba929062 bintools-wrapper: Import separately from cc-wrapper 2017-12-13 16:08:18 -05:00
Shea Levy 8a7b2f889d
insert_dylib: Set platforms attribute 2017-12-10 20:22:36 -05:00
Shea Levy 6d7ceedaf9
Add insert_dylib darwin package. 2017-12-09 14:37:24 -05:00
Vladimír Čunát cdde22aef5
Merge branch 'staging' (older one) 2017-12-08 10:22:31 +01:00
Vladimír Čunát 6f5d989478
treewide: checkMeta fixes for x86_64-linux 2017-12-07 07:50:47 -05:00
Orivej Desh 99ed136809 darwin.Libsystem: fix build on 10.13.2 2017-12-04 18:54:39 +00:00
John Ericson e755a8a27d treewide: Use targetPrefix instead of prefix for platform name prefixes
Certain tools, e.g. compilers, are customarily prefixed with the name of
their target platform so that multiple builds can be used at once
without clobbering each other on the PATH. I was using identifiers named
`prefix` for this purpose, but that conflicts with the standard use of
`prefix` to mean the directory where something is installed. To avoid
conflict and confusion, I renamed those to `targetPrefix`.
2017-11-27 03:15:50 -05:00
Daiderd Jordan a0948ffdb0
Csu: fix build with CoreFoundation 2017-11-21 23:15:00 +01:00
Orivej Desh b089c21506 Merge branch 'master' into staging
* master: (39 commits)
  python.pkgs.pybfd: move to python-modules
  documentation: python 2.6 is no more
  documentation: python3Packages is python36Packages
  wireguard: 0.0.20171101 -> 0.0.20171111
  php_excel: init at 1.0.2
  libxl: init at 3.8.1
  matrix-synapse: 0.24.1 -> 0.25.1
  grafana: 4.6.1 -> 4.6.2
  linux: 4.4.98 -> 4.4.99
  linux: 4.9.62 -> 4.9.63
  linux: 4.13.13 -> 4.13.14
  nixos/zsh: add the type for enableAutosuggestions option
  zsh-powerlevel9k: init at 2017-11-10
  fio: 3.1 -> 3.2
  filebench: rehash source
  nano: 2.8.7 -> 2.9.0
  bonnie: replace dead source link
  less: 520 -> 529
  strace: 4.19 -> 4.20
  iperf: 3.2 -> 3.3
  ...
2017-11-19 08:30:14 +00:00
Shea Levy a8dc88258f
Merge branch 'system_cmds' 2017-11-18 08:34:05 -05:00
John Ericson ccb93aee17
Merge pull request #31754 from obsidiansystems/simplify-darwin-binutils
cctools, darwin-bintuils: Don't always bring in headers
2017-11-17 15:31:45 -05:00
John Ericson 652c2beda9 cctools: Don't always bring in headers
- Give cctools a dev output for the headers

 - Update Libsystem to grab the headers from that dev output

 - Don't include the headers in Darwin binutils, just as GNU Binutils no
   longer does.
2017-11-16 17:45:41 -05:00
John Ericson 32a6838bc6 darwin-bintuils: Don't try to bring in missing bits of GNU Binutils
libbfd and libopcdes are separate derivations which now provide all
headers and libraries. Binutils should just provide executables.
2017-11-16 17:40:38 -05:00
Daiderd Jordan dadcca3f40 frameworks-coremedia: add impure dependnecy on CoreImage
Fixes ffmpeg sandbox build on darwin
2017-11-14 21:51:40 -05:00
Dan Peebles 49a5791bc4 darwin.stdenv: fix up to allow sandboxing 2017-11-14 10:36:04 -05:00
Dan Peebles 762a05cbb6 cctools-port: add a couple of (temporary) impure dependencies 2017-11-14 10:35:18 -05:00
Dan Peebles b2f8185695 configd: remove unsupported sandbox profile 2017-11-14 10:34:28 -05:00
Vladimír Čunát 8559b6db82
Merge branch 'master' into staging
A couple thousand rebuilds from master.
2017-11-11 09:25:07 +01:00
Pascal Wittmann 24e87b49b6
Change many homepage urls from http to https #30636 2017-11-10 22:13:46 +01:00
Daiderd Jordan 63bac2c23e
cf-private: overwrite headers from CF 2017-11-09 23:29:41 +01:00
Dan Peebles bb863378d3 adv_cmds: remove custom sandbox profile (not allowed in recent Nix) 2017-11-08 22:32:44 -05:00
Dan Peebles 48a34be41c Support frameworks properly in sandbox 2017-11-08 22:06:52 -05:00
Domen Kožar 2b995c544d osx_private_sdk: reduce output size and remove it from runtime closures 2017-11-07 11:06:10 +01:00
Domen Kožar ea6a4068cf
darwin: build apple stuff in parallel 2017-10-31 07:47:58 +00:00
Vladimír Čunát 6525c22ef1
Merge branch 'master' into staging
Hydra: ?compare=1401528
2017-10-14 10:36:13 +02:00
Dan Peebles e86991e1e8 darwin: fix assorted xcbuild builds
This includes adding a new xcbuild-based libutil build to test the waters a bit there.
We'll need to get xcbuild into the stdenv bootstrap before we can make the main build,
but it's nice to see that it can work.
2017-10-12 07:16:22 -04:00
Shea Levy 48595335f4
Add system_cmds apple project
Actually just build sysctl for now, as xcbuild segfaults.
2017-10-11 15:13:27 -04:00
Dan Peebles b426c85ce2 Get rid of most @rpath nonsense on Darwin
This requires some small changes in the stdenv, then working around the
weird choice LLVM made to hardcode @rpath in its install name, and then
lets us remove a ton of annoying workaround hacks in many of our Go
packages. With any luck this will mean less hackery going forward.
2017-10-08 16:13:46 -04:00
Daiderd Jordan b196241f42
reattach-to-user-namespace: 2.5 -> 2.6 2017-09-26 00:58:51 +02:00
Daiderd Jordan bb02b800a2
darwin-frameworks: add impure version of CoreFoundation 2017-09-23 22:29:43 +02:00
Peter Simons 3510197dcc Revert "haskell infra, ghc: Slight cleanup" 2017-09-15 18:45:15 +02:00
John Ericson 2295533f43 Merge pull request #29424 from obsidiansystems/slight-haskell-cleanup
haskell infra, ghc: Slight cleanup
2017-09-15 12:12:47 -04:00
John Ericson e92cda161a haskell infra: Fix cross as much as possible without changing hashes 2017-09-15 11:37:39 -04:00
Jörg Thalheim 419869269d Merge pull request #28635 from ThomasMader/ldc
Init ldc at 1.3.0, fix bootstrap dmd build, fix dtools test, run dmd-testsuite in checkPhase and fix Foundation framework
2017-09-15 10:32:10 +01:00
John Ericson 0d12d040e7 Merge pull request #29402 from obsidiansystems/binutils-output-ref
treewide: Fix some references to binutils
2017-09-14 18:51:12 -04:00
John Ericson bf7b521500 treewide: Fix some references to binutils
- Compiler's shouldn't use `binutils.dev` as that doesn't yet exist
   with a cross binutils.

 - Last two `binutils.binutils` which weren't reverted
2017-09-14 18:12:54 -04:00
Matthew Bauer 9111b53325 duti: init at 1.5.4pre
I would init at 1.5.4, but sadly it doesn’t work on OS X 10.11+.
2017-09-13 16:33:54 -05:00
Eelco Dolstra ec8d41f08c
Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper"
This reverts commit 0a944b345e, reversing
changes made to 61733ed6cc.

I dislike these massive stdenv changes with unclear motivation,
especially when they involve gratuitous mass renames like NIX_CC ->
NIX_BINUTILS. The previous such rename (NIX_GCC -> NIX_CC) caused
months of pain, so let's not do that again.
2017-09-07 12:51:21 +02:00
Frederik Rietdijk d7ef196c26 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-05 10:11:06 +02:00
Tuomas Tynkkynen e6a83ed89c apple-source-releases: Add some meta.platforms
Or Hydra tries to build them on Linux...
2017-09-04 19:04:05 +03:00
Thomas Mader 2a0f1ecdc8 apple-sdk: Move cf-private first in list, otherwise the build fails because CoreFoundation/CFAttributedString.h could not be found.
The problem appeared when building ldc on Mac OSX. See also 13778.
2017-09-02 08:35:07 +02:00
John Ericson b64736a8e4 darwin binutils: Unwrap GNU Binutils before splicing with cctools 2017-09-01 11:44:56 -04:00
Daiderd Jordan adca58c2e7 Merge pull request #27598 from LnL7/darwin-cf-rpath
CoreFoundation: use rpath to fix issues when using frameworks
2017-08-29 22:16:56 +02:00
Vladimír Čunát 2858c41823
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
2017-08-29 10:51:54 +02:00
Daiderd Jordan 5a28fd660a
darwin-frameworks: move fixup setup-hook 2017-08-28 23:25:11 +02:00