Eelco Dolstra
c981787db9
Revert "cc-wrapper, bintools-wrapper: simply symlink man and info outputs"
...
This reverts commit 02c09e0171
.
2018-08-09 12:57:38 +02:00
Jan Malakhovski
02c09e0171
cc-wrapper, bintools-wrapper: simply symlink man and info outputs
...
See discussion in #44516 .
2018-08-06 20:50:16 +00:00
Will Dietz
f3693b0647
make-bootstrap-tools-cross: remove broken i686-musl variant
...
Not terribly difficult to get this working, but until it does
remove it so the cross jobset doesn't have the failures this introduces.
2018-06-25 11:16:10 -05:00
John Ericson
d00cc1242f
Merge pull request #40040 from obsidiansystems/gnu-config-arm
...
gnu-config: Update, allowing hacks to be removed
2018-05-14 11:20:09 -04:00
John Ericson
f2b575bd7b
Merge remote-tracking branch 'upstream/master' into gnu-config-arm
2018-05-14 10:58:15 -04:00
John Ericson
eebd455dc0
linux stdenv: Update gnu-config on all non-x86
...
Not just Aarch64. Other non-x86 platforms might be old enough, but I am
about to update gnu-config to handle things better across the board.
2018-05-14 10:55:32 -04:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions
2018-05-02 15:40:38 -05:00
Michael Raskin
ce929e6a92
Merge pull request #39457 from oxij/stdenv/texinfo-bash
...
stdenv: change texinfo bootstrap handling; texinfo, bash: simplify expressions
2018-04-27 19:03:26 +00:00
Will Dietz
f31b147f63
linux bootstrap: remove assertion failure from dev, fixes 'nix eval'
...
As in:
$ nix eval -f . bash
Also remove the glibc propagation inherit that made these necessary,
stages handle propagating libc themselves (apparently) and
AFAICT no hashes are changed as a result of this.
2018-04-26 10:19:52 -05:00
Jan Malakhovski
a809fdc8e1
stdenv: linux: stop recompiling texinfo
...
This makes stdenv bootstraping a bit more efficient.
We don't recompile most of other stuff used in bootstrapping stdenv too.
2018-04-25 19:50:54 +00:00
Will Dietz
97698b0d6d
musl-stdenv: don't add special allowance for libiconv
2018-04-25 08:08:47 -05:00
Will Dietz
791b5bbbf4
musl bootstrap: remove libiconv
2018-04-24 21:27:28 -05:00
John Ericson
adaa110a72
binutils: No more darwin conditionals
...
Since at least d7bddc27b2
, we've had a
situation where one should depend on:
- `stdenv.cc.bintools`: for executables at build time
- `libbfd` or `libiberty`: for those libraries
- `targetPackages.cc.bintools`: for exectuables at *run* time
- `binutils`: only for specifically GNU Binutils's executables,
regardless of the host platform, at run time.
and that commit cleaned up this usage to reflect that. This PR flips the
switch so that:
- `binutils` is indeed unconditionally GNU Binutils
- `binutils-raw`, which previously served that role, is gone.
so that the correct usage will be enforced going forward and everything
is simple.
N.B. In a few cases `binutils-unwrapped` (which before and now was
unconditionally actual GNU binutils), rather than `binutils` was used to
replace old `binutils-raw` as it is friendly towards some cross
compilation usage by avoiding a reference to the next bootstrapping
change.
2018-04-03 13:34:52 -04:00
Jan Malakhovski
7079e744d4
Merge branch 'master' into staging
...
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):
pkgs/development/libraries/epoxy/default.nix
pkgs/development/libraries/gtk+/3.x.nix
pkgs/development/python-modules/asgiref/default.nix
pkgs/development/python-modules/daphne/default.nix
pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Will Dietz
ece4c62d4b
make-bootstrap-tools: preserve coreutils symlinks
...
We go out of our way (see top of file) to build a single binary
with symlinks for all of the tools, but were losing them
when preparing the bootstrap tools.
2018-03-06 15:13:56 +02:00
Tuomas Tynkkynen
34f95d92a2
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/misc/pytrainer/default.nix
pkgs/development/tools/pew/default.nix
pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02:00
John Ericson
dfc5d7835d
Merge pull request #35247 from telent/mips32
...
lib, treewide: Add missing MIPS arches, and fix existing usage
2018-02-27 14:01:15 -05:00
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
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
Daniel Barlow
9c50ae6898
lib, treewide: Add missing MIPS arches, and fix existing usage
...
Existing "mips64el" should be "mipsel".
This is just the barest minimum so that nixpkgs can recognize them as
systems - although required for building individual derivations onto
MIPS boards, it is not sufficient if you want to actually build nixos on
those targets
2018-02-23 20:43:42 -05:00
Shea Levy
32ce7012f0
Merge branch 'master' into gcc-7
2018-02-18 16:27:22 -05:00
Shea Levy
0a0ecc4c2c
Enable building riscv64 cross bootstrap tools
...
Fixes #35089
2018-02-18 16:07:13 -05:00
Tuomas Tynkkynen
b1916b45a3
Merge remote-tracking branch 'upstream/staging' into gcc-7
...
Conflicts:
pkgs/development/libraries/libidn/default.nix
pkgs/top-level/all-packages.nix
2018-02-15 15:45:37 +02:00
Will Dietz
84a527ea5e
x86_64-musl bootstrap: use separate 64bit busybox
...
Avoid issues like #24954 .
2018-02-13 09:45:05 -06:00
Will Dietz
4619f8e06d
new musl bootstrap URL's, much smaller. rebuild all the things.
2018-02-13 09:45:04 -06:00
Will Dietz
268bff6185
make-bootstrap-tools: set XZ to maximum level, big wins
...
x86_64 bootstrap tarball goes from 37M -> 21M (!)
2018-02-13 09:45:04 -06:00
Will Dietz
a4c69744dc
aarch64-musl, armv6l-musl: fetch from wdtz.org instead of storePath
2018-02-13 09:45:04 -06:00
Will Dietz
8bedb690a2
add musl bootstrap paths for aarch64, armv6l
...
Aarch64 tools tested briefly with qemu-aarch64,
but neither have been actually used yet :).
For now only "host" indirectly via binary cache
at cache.allvm.org.
2018-02-13 09:45:04 -06:00
Will Dietz
d00f200f4e
bootstrap-files: nicer naming
2018-02-13 09:45:03 -06:00
Will Dietz
119920faa6
restore stdenv.glibc, will remove separately.
2018-02-13 09:45:03 -06:00
Will Dietz
c8d03e6298
make-bootstrap-tools: grab libc from stdenv.cc.libc
...
This is the same in current cases AFAICT,
other than uses musl instead of glibc when musl-native.
2018-02-13 09:44:57 -06:00
Will Dietz
9bc8127dc3
bootstrap-tools-cross, release-cross: add various musl entries
2018-02-13 09:44:56 -06:00
Will Dietz
4b6b83f159
linux stdenv: find bootstrap files by libc, then arch
2018-02-13 09:44:42 -06:00
Will Dietz
5a8002873e
fixup linux stdenv bootstrap
2018-02-13 09:44:40 -06:00
Will Dietz
9dbbd75e54
musl bootstrap: allow libiconv
2018-02-13 09:44:40 -06:00
Will Dietz
fd00d37b4f
musl64 bootstrap: grab from gravity, requires netrc magic
2018-02-13 09:44:39 -06:00
Will Dietz
3ee5094934
linux bootstrap for musl: kludgery
2018-02-13 09:44:39 -06:00
Will Dietz
0e16989d39
bootstrap-tools-musl: WIP
2018-02-13 09:44:37 -06:00
Will Dietz
a0af2aadb6
for now, copy bootstrap-tools instead of modify in-place
2018-02-13 09:44:37 -06:00
Will Dietz
0ac504227d
make-bootstrap-tools: initial musl support, less glibc-specific
2018-02-13 09:44:37 -06:00
Will Dietz
4831495995
make-bootstrap-tools: glibc -> libcCross
2018-02-13 09:44:37 -06:00
Will Dietz
5ac5a3ebb5
make-bootstrap-tools-cross.nix: add musl -> musl64
2018-02-13 09:44:35 -06:00
Tuomas Tynkkynen
6a11ebfae9
Merge remote-tracking branch 'upstream/master' into gcc-7
...
Conflicts:
pkgs/development/compilers/gcc/7/default.nix
pkgs/development/libraries/SDL2/default.nix
pkgs/top-level/all-packages.nix
2018-01-26 16:46:43 +02:00
John Ericson
ab651d2c9b
linux bootstrap tools: Use same derivation whether cross compiling or not
2018-01-02 13:52:41 -05:00
John Ericson
f083248290
linux bootstrap tools cross: Nuke more refs
...
libgcc.a and similar
2017-12-30 22:04:23 -05: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
Michael Raskin
bd8cd3eaed
Revert switching hello to fetchipfs, re: #18296
2017-11-13 17:45:16 +01:00
John Ericson
ff023c9bc6
treewide: Remove references to removed binutils outputs
2017-11-13 08:46:15 -05:00