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
Jan Malakhovski
49afe1d490
stdenv: darwin: give distinct names to all the stages
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
a89899ce4e
fetchurl: cleanup, better errors
...
Also fix what seems like bugs in uncommon `stdenv`s.
2018-02-18 14:24:53 +00:00
Vladimír Čunát
03eef81727
darwin bootstrap tools: fix after #34339 (http2 in curl)
2018-02-10 19:20:44 +01:00
Tuomas Tynkkynen
6ed0fe7e45
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/build-support/fetchbower/default.nix
pkgs/build-support/fetchdarcs/default.nix
pkgs/build-support/fetchgx/default.nix
pkgs/development/python-modules/botocore/default.nix
pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
pkgs/tools/admin/awscli/default.nix
2018-01-14 21:18:27 +02:00
John Ericson
940c4fa3f5
treewide: Fetchers should use stdenvNoCC
.
2018-01-10 11:18:44 -05:00
Daiderd Jordan
e66a5f8862
Merge pull request #33342 from LnL7/clang-outputs
...
clang: add lib output
2018-01-07 09:43:38 +01:00
Daiderd Jordan
b0c043d26c
stdenv: allow lib output of clang on darwin
2018-01-02 20:00:31 +01:00
Tuomas Tynkkynen
47c782f7f5
Merge remote-tracking branch 'upstream/master' into staging
2017-12-26 21:10:12 +02:00
John Ericson
4651407654
darwin stdenv: Make stdenv.cc, not stdenv, bring in libcxx
...
stdenvNoCC should not inject any C++ standard library, just as it
doesn't inject any C standard library. stdenv still does, but only
indirectly through stdenv.cc. Wrapped clangs can be simplified now that
they don't need to worry about clobbering CoreFoundation when replacing
the C++ standard library implementation.
This generally-good cleanup should assist with debugging some C++
failures in #26805 .
2017-12-25 19:32:07 -05:00
Vladimír Čunát
ced4e5a683
darwin stdenv boostrap tools: use curl without kerberos
...
/cc #29785 . Otherwise we would have to put the lib in, etc.
2017-12-24 11:10:10 +01:00
John Ericson
2bba929062
bintools-wrapper: Import separately from cc-wrapper
2017-12-13 16:08:18 -05:00
Orivej Desh
d99a2fc093
Merge branch 'master' into staging
...
* master: (293 commits)
go_1_9: skip flaky TestServerCancelsReadTimeoutWhenIdle
qsyncthingtray: fix build
qt56.qtwebengine: fix build
stdman: d860212 -> 2017.04.02
jackett: use mono50
hg-git: disable with python3
hg-git: 0.8.5 -> 0.8.10
xfce4-settings: enable parallel building
gcc-snapshot: mark as broken
heaptrack: 2017-02-14 -> 2017-10-30
nixos-container: Modify existing test to cover show-ip command
nixos-container: Make show-ip work together with ipv4 + netmask
linux-copperhead: 4.13.12.a -> 4.13.13.a
matterbridge: 1.1.0 -> 1.4.1
nixos/nghttpx: add module for the nghttpx proxy server (#31680 )
mattermost: 4.3.0 -> 4.4.0
breakpad: delete
simp_le: 0.2.0 -> 0.6.1
certbot: 0.11.1 -> 0.19.0
afl: 2.51b -> 2.52b
...
2017-11-17 05:35:09 +00:00
Vladimír Čunát
72b98b8b60
darwin.stdenv: fix a typo in comment ;-)
2017-11-14 21:13:53 +01:00
John Ericson
728446f755
Merge pull request #30484 from obsidiansystems/libbfd
...
bfd, opcodes: Init separate derivations for binutils libraries
2017-11-14 12:10:44 -05:00
Dan Peebles
49a5791bc4
darwin.stdenv: fix up to allow sandboxing
2017-11-14 10:36:04 -05:00
Dan Peebles
f82063ed20
darwin.stdenv: use new, purer, bootstrap tools
...
This is the first step to getting a sandboxable nixpkgs
2017-11-13 21:03:45 -05:00
Dan Peebles
d5bdfcbfe6
darwin.make-bootstrap-tools: fix ICU reference to improve purity
2017-11-13 20:27:11 -05:00
John Ericson
ff023c9bc6
treewide: Remove references to removed binutils outputs
2017-11-13 08:46:15 -05:00
John Ericson
d349f9a340
cc-wrapper: Use stdenvNoCC to build
...
cc-wrapper may wrap a cc-compiler, but it doesn't need one to build
itself. (c.f. expand-response-params is a separate derivation.) This
helps avoid cycles on the cross stuff, in addition to removing a
useless dependency edge.
I could have been super careful with overrides in the stdenv to avoid
the mass rebuild, but I don't think it's worth it.
2017-09-26 14:08:21 -04:00
John Ericson
77bd6313bb
darwin stdenv: cctools override needs to go away when targetPlatform changes
2017-09-18 14:39:38 -04: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
John Ericson
dbf6d20d64
binutils-wrapper: Import separately from cc-wrapper
2017-09-01 11:44:56 -04:00
John Ericson
8dbdc5dd51
darwin-stdenv: Hack around impurity with --disable configure flag
2017-08-31 18:08:05 -04:00
John Ericson
3b6e7fe123
darwin-stdenv: Don't use nativeTools
...
Now, we'll actually use the wrapped ld to link
2017-08-31 12:37:48 -04:00
Daiderd Jordan
92652b4d79
darwin-CF: use @rpath for library id and add an rpath entry for CF based on NIX_COREFOUNDATION_RPATH
2017-08-28 23:24:58 +02:00
John Ericson
0135e61b4c
Merge remote-tracking branch 'upstream/master' into staging
...
That way the tarball job succeeds
2017-08-21 18:42:57 -04:00
John Ericson
c035711072
cc-wrapper: Remove unused params
...
Ensured hashes unchanged and eval succeeds in tarball job
2017-08-21 18:40:41 -04:00
Frederik Rietdijk
04cd1db2b7
Merge remote-tracking branch 'upstream/master' into HEAD
2017-08-21 01:28:27 +02:00
John Ericson
fbab1d485b
stdenvs: Distinguish between extraBuildInputs
and extraNativeBuildInputs
...
This version continues to use bash + stdenv/setup for the default
inputs.
2017-08-18 12:02:13 -04:00
Tuomas Tynkkynen
7320fa9d45
Revert "stdenvs: Distinguish between extraBuildInputs
and extraNativeBuildInputs
"
...
This reverts commit eeabf85780
.
This change suddenly makes tons of stdenv internals visible in
nativeBuildInputs of every derivation, which doesn't seem desirable.
E.g:
````
nix-repl> hello.nativeBuildInputs
[ «derivation /nix/store/bcfkyf6bhssxd2vzwgzmsbn7b5b9rpxc-patchelf-0.9.drv»
«derivation /nix/store/4wnshnz9wwanpfzcrdd76rri7pyqn9sk-paxctl-0.9.drv»
<< snip 10+ lines >>
«derivation /nix/store/d35pgh1lcg5nm0x28d899pxj30b8c9b2-gcc-wrapper-6.4.0.drv»
]
````
2017-08-18 13:21:56 +03:00
John Ericson
61d241f405
darwin stdenv: Float persistentN
bindings into per-stage let
s
2017-08-16 16:36:21 -04:00
John Ericson
eeabf85780
stdenvs: Distinguish between extraBuildInputs
and extraNativeBuildInputs
...
Additionally, instead of pulling them from `setup.sh`, route them via
Nix. This gets us one step closer to making stdenv be a plain attribute
set instead of a derivation.
2017-08-15 18:24:54 -04:00
John Ericson
8ba6012dfd
Merge PR #27536
2017-08-03 17:25:30 -04:00
John Ericson
0c37778c2c
cc-wrapper: WIP linking hack for mac OS
...
Probably best to override Haskell packages set, or anything else
linking a lot of libraries, with this.
2017-07-31 17:02:56 -04:00
John Ericson
98cff3f446
darwin stdenv: Ensure libSystem reexports the right libraries
...
The logic was made pure for the normal libSystem, but this change never
made it to the bootstrap tools. Deduplication the logic as the comment
suggests would have prevented this, but here's a stop-gap until we do
so.
2017-07-25 14:35:43 -04:00
Dan Peebles
0419452113
Fix Darwin stdenv to work on 10.13
...
The main changes are in libSystem, which lost the coretls component in 10.13
and some hardening changes that quietly crash any program that uses %n in
a non-constant format string, so we've needed to patch a lot of programs that
use gnulib.
2017-07-11 21:56:38 -04:00
Daiderd Jordan
980346592c
Merge branch 'staging' into master
2017-07-08 22:22:17 +02:00
John Ericson
a302d7360f
top-level: {build,host,target}Platform are defined in the stdenv instead
...
See #27069 for a discussion of this
2017-07-07 12:55:02 -04:00
Orivej Desh
2bc7b4e134
cc-wrapper: simplify expandResponseParams parser
...
Import from b2446902fe
2017-07-03 21:51:23 +00:00
Ryan Trinkle
d07f30f628
cc-wrapper: improve response file parsing speed
2017-06-30 15:20:53 -04:00
Daiderd Jordan
f65b5365bb
darwin-stdenv: remove llvm/clang manpage overrides from
2017-06-26 20:24:17 +02:00
John Ericson
459f1c60f5
cc-wrapper: Learn about target prefixes
...
This is first step towards getting rid of gcc-wrapper-cross
2017-06-22 17:52:27 -04:00
John Ericson
c4ba2e3ef6
cc-wrapper: Remove stdenv.is*
for targetPlatform.is*
...
Modify bootstrapping stdenvs to make sure `targetPlatform` also passed.
2017-06-22 17:52:27 -04:00
Daiderd Jordan
9e2aba3572
darwin-stdenv: remove python-sphinx and a bunch of other dependencies from the stdenv
2017-06-01 23:23:56 +02:00
Daiderd Jordan
db4ff1d305
Merge pull request #26091 from LnL7/darwin-cf-10.10
...
CoreFounation: 10.9 -> 10.10
2017-05-28 20:38:16 +02:00
Daiderd Jordan
779ec14402
Merge pull request #25921 from dtzWill/feature/llvm-manpages
...
llvm-4/clang-4: Build and install man pages
2017-05-28 20:29:21 +02:00
Daiderd Jordan
077840e528
darwin-stdenv: use darwin.ICU instread of icu
2017-05-27 23:19:49 +02:00
John Ericson
1dc6f15de9
stdenv: define is* predicates with hostPlatform.is*
...
This is a saner default until stdenv's are removed altogether
2017-05-22 00:25:02 -04:00