JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,545 Commits 2 Branches 0 Tags 13 GiB
626cc7eb21
Commit Graph

532 Commits

Author SHA1 Message Date
John Ericson
4f7cdd35d5
Merge pull request #40139 from obsidiansystems/modular-setup-hooks 
treewide: Modular setup hooks
 2018-05-07 15:32:10 -04:00
John Ericson
2110c0bd30 treewide: Use pkgs/build-support/roles.bash to remove copy pasta 
Also fix some setup hooks that unnecessarily used environment hooks,
which revolted in the same variable being modified too many times.
 2018-05-07 15:10:37 -04:00
Jörg Thalheim
1537dca7fc
Merge pull request #39914 from nlewo/pr-retpoline 
gcc49: backport retpoline support
 2018-05-04 19:14:35 +01:00
John Ericson
88d18d2e04
Merge pull request #39947 from obsidiansystems/libcxx-cross 
lib{std,}c++: Fix setup hooks for cross
 2018-05-03 18:20:13 -04:00
John Ericson
39df5831ca lib{std,}c++: Fix setup hooks for cross 2018-05-03 17:55:03 -04:00
Patrick Hilhorst
0a4622cfe9 gcc-snapshot: Removed java as a target language 2018-05-03 19:48:00 +02:00
Patrick Hilhorst
719810d474 gcc7: Removed X11 components, since they were only used by langJava 
See also:

51ac1d8df0
https://github.com/NixOS/nixpkgs/pull/39866#discussion_r185813776
 2018-05-03 16:43:51 +02:00
Patrick Hilhorst
51ac1d8df0 gcc8: Removed X11 components, since they were only used by langJava 2018-05-03 16:30:32 +02:00
Antoine Eiche
5b6129f69c gcc49: remove darwin support 2018-05-03 15:12:01 +02:00
Patrick Hilhorst
3641b35bae gcc7: Removed java as a target language 2018-05-03 15:11:41 +02:00
Patrick Hilhorst
d21ff87160 gcc8: Removed java as a target language 2018-05-03 13:07:19 +02:00
Antoine Eiche
ada2fc088c gcc49: backport retpoline support 
To mitigate Spectre Variant 2, GCC needs to have retpoline
support (-mindirect-branch and -mfunction-return arguments on amd64
and i386).

Patches were pulled from H.J. Lu's backport branch to
4.9 (hjl/indirect/gcc-4_9-branch), available at
https://github.com/hjl-tools/gcc/tree/hjl/indirect/gcc-4_9-branch/master. Upstream
GCC does not apply patches to anything older than the
gcc-6-branch. H.J. Lu is the author of the upstream retpoline commits
as well.

Several Linux distributions already backported these patches to GCC 4
branches and some old kernels (3.13 for instance) have been recompiled
with these GCC patches. These kernels only allow to load kernel
modules that are compiled with the retpoline support.

References:
- Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/gcc-4.8/+bug/1749261
- Ubuntu package: https://launchpad.net/ubuntu/+source/gcc-4.8/4.8.4-2ubuntu1~14.04.4

Fixes #38394
 2018-05-03 11:35:49 +02:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Patrick Hilhorst
5794d94136 gcc8: made the remove-selftests patch more robust, removed old hash 2018-05-02 22:31:58 +02:00
Patrick Hilhorst
c7a6b36658 gcc8: removed commented gcc7 hash 2018-05-02 20:53:13 +02:00
Patrick Hilhorst
d0708a30c4 gcc8: removed merged patches 
Log:
```
patching sources
applying patch /nix/store/6m27y27zvzsjn1ir4y8mm9nc9xnh2sgx-riscv-no-relax.patch
patching file gcc/config/riscv/riscv.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file gcc/config/riscv/riscv.c.rej
patching file gcc/config/riscv/riscv.opt
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file gcc/config/riscv/riscv.opt.rej
patching file gcc/doc/invoke.texi
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
```
 2018-05-02 20:51:01 +02:00
Patrick Hilhorst
728eb27618 gcc8: added myself as maintainer 2018-05-02 18:52:50 +02:00
Patrick Hilhorst
659363fb40 gcc8: init at 8.1.0 2018-05-02 18:34:28 +02:00
John Ericson
591d8c7a19
Merge pull request #39458 from oxij/stdenv/beautifications 
stdenv: better names for cc and bintools
 2018-04-26 11:41:18 -04:00
John Ericson
b9acfb4ecf treewide: isArm -> isAarch32 
Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.

The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:

```
ISA:             ARMv8   {-A, -R, -M}
                 /    \
Mode:     Aarch32     Aarch64
             |         /   \
Encoding:   A64      A32   T32
```

At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.

The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.

[1]: https://developer.arm.com/products/architecture/a-profile

(cherry picked from commit ba52ae5048)
 2018-04-25 15:50:41 -04:00
John Ericson
ba52ae5048 treewide: isArm -> isAarch32 
Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.

The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:

```
ISA:             ARMv8   {-A, -R, -M}
                 /    \
Mode:     Aarch32     Aarch64
             |         /   \
Encoding:   A64      A32   T32
```

At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.

The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.

[1]: https://developer.arm.com/products/architecture/a-profile
 2018-04-25 15:28:55 -04:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Jan Malakhovski
2afd3c901e gcc: prepend crossNameAddon instead of appending it (like binutils does) 2018-04-25 00:41:14 +00:00
Shea Levy
d0a8866622
Merge branch 'binutils-2.30' into staging 2018-03-22 07:28:10 -04:00
Tuomas Tynkkynen
74720a36c7 Merge remote-tracking branch 'upstream/master' into staging 2018-03-21 23:51:55 +02:00
Clemens Fruhwirth
c0cf13e52e Add space for NIX_CXXSTDLIB_COMPILE+=' ...' as NIX_CXXSTDLIB_COMPILE might not be empty. 2018-03-19 13:18:49 +01:00
Shea Levy
a5d064826b
gcc: Try to fix /bin/sh dependency 2018-03-17 21:58:15 -04:00
Shea Levy
017d678a00
gcc: Add uncommitted patch. 2018-03-16 16:39:55 -04:00
Shea Levy
a1ede569ef
gcc: Unconditionally add some upstream RISC-V patches. 2018-03-16 16:38:32 -04:00
Shea Levy
c69d8bf5e6
treewide: Remove gnat support. 
See discussion in 6ac7b19c97.
 2018-03-08 13:56:36 -05: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
Shea Levy
4728ef130e
RISC-V: Add upstream gcc patch to fix -pthread. 
Fixes libmicrohttpd build.
 2018-02-26 05:24:36 -05: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
Will Dietz
39f61d5c02 gcc7: fix native and cross-musl build, sync w/gcc6 fixes 2018-02-21 20:55:22 -06: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
9bd4e00ce3 gcc6: cross-musl disable libmpx 2018-02-13 09:45:03 -06:00
Will Dietz
7eba45d063 gcc5: patch for musl compat/support 2018-02-13 09:44:52 -06:00
Will Dietz
3b0d3248c9 gcc7: tweak check, target -> host 2018-02-13 09:44:43 -06:00
Will Dietz
f566e3f987 gcc7: more selftest disabling, whenever building cross 2018-02-13 09:44:42 -06:00
Will Dietz
ff9b494103 gcc7: Apply patch to fix selftest w/musl? 2018-02-13 09:44:39 -06:00
Will Dietz
f146a3c316 gcc5, 7: same fixes as gcc6 2018-02-13 09:44:38 -06:00
Will Dietz
fbf41b9ee2 gcc6: try to fix LOCAL_INCLUDE_DIR problem w/musl 2018-02-13 09:44:38 -06:00
Will Dietz
5eea9e82f4 gcc6: try patching MUSL_DYNAMIC_LINKER as well 2018-02-13 09:44:38 -06:00
Will Dietz
ece06deee4 gcc6: try to fix gccCrossStageStati 2018-02-13 09:44:38 -06:00
Will Dietz
15d401dcfa gcc: disable libsanitizer, libgomp on musl 2018-02-13 09:44:38 -06:00
Ben Gamari
d625f181bd autoconf: Enable cross-compilation 2018-02-13 09:44:28 -06:00
Franz Pletz
e2c1c76fd0
Merge remote-tracking branch 'origin/master' into gcc-7 2018-01-28 23:17:32 +01:00
Tuomas Tynkkynen
11e98eaae7 gcc7: More resync from gcc6 
I think I managed to lose these during a merge conflict.
 2018-01-28 03:15:05 +02:00
Clemens Fruhwirth
2f83f52ab8 gcc: 7.2.0 -> 7.3.0 2018-01-26 15:59:22 +01:00
Tuomas Tynkkynen
99fc949330 gcc7: Drop flex again 
I think I lost this during merge conflict resolution
 2018-01-26 16:50:13 +02:00
John Ericson
c98e6b6771 gcc, binutils: Narrow down ARM hack so only native builds are affected 2018-01-09 17:25:49 -05:00
Drew Hess
3ed545ab31
Revert "gcc, binutils: Get rid of 32-bit ARM configure flag exception" 
This commit breaks native armv7l-linux builds. Revert it until it can
be root-caused. This reversion does not affect other platforms or
cross-compiling.

This reverts commit 0f5c804631.
 2018-01-08 20:03:33 -08:00
Vladimír Čunát
1fcd92ce92
Merge branch 'master' into staging 
A few thousand rebuilds from master, again.
Hydra: ?compare=1422362
 2017-12-31 09:53:49 +01:00
John Ericson
4ad9a97e96 gcc: Don't let solaris hack pollute CC elsehwere 2017-12-30 22:04:22 -05:00
John Ericson
0f5c804631 gcc, binutils: Get rid of 32-bit ARM configure flag exception 
Now that we do `--enable-targes=all`, there is no risk of missing the
needed emulation.

This reverts commit ebc9b161cd.
This reverts commit 88efc22b44.
 2017-12-30 22:04:22 -05:00
John Ericson
9cda2f5559 gcc: Fix deps, for cross and consistency 
Mainly making sure we have tools to build target libs
 2017-12-30 22:04:22 -05:00
John Ericson
114a9b6253 gcc: Let cc-wrapper's setup hook define any tool env vars we need 2017-12-30 22:04:21 -05:00
John Ericson
bc23afe5c7 gcc: Add build->build dep for C compilers 
5 already had this, but I forgot the other versions.
 2017-12-30 22:04:21 -05:00
John Ericson
5b74540c5b treewide: Use depsBuildBuild for buildPackges.stdenv.cc 2017-12-30 22:04:21 -05:00
Dmitry Kalinkin
6d9769663d
cc-wrapper: allow compilers to specify unsupported hardening modes 
Fixes: 0fd7ef61b2 ('clang_34: Disable hardening bits (#28543)')
 2017-12-30 12:23:25 -05:00
John Ericson
5db559f855 Merge branch 'mingw32-w64-fix' into ericson2314-cross-base 2017-12-29 15:46:02 -05:00
John Ericson
52a4a7c3bb
Merge pull request #33167 from bnikolic/mingw32-w64-fix 
Mingw_w64 fix to get cross-compilation working again
 2017-12-29 15:44:17 -05:00
John Ericson
bc3a6e260a Merge commit '3afe325a3e2f906ba512fb7a2f28f79496711592' into mingw32-w64-fix 2017-12-29 15:28:56 -05:00
John Ericson
5d336d36bb Merge commit 'e82bd498d1a2a28fb20249569a6f49fcaab9aca8' into mingw32-w64-fix 2017-12-29 15:28:49 -05:00
John Ericson
169227bfd2 Merge commit '3a59cd87f26cc59c91fb821749b1ec0d64922f87' into mingw32-w64-fix 2017-12-29 14:24:10 -05:00
John Ericson
2365e2ffcd Merge commit '51948eab9415fde1825dea5c7d31b99b2e1a0fdb' into mingw32-w64-fix 2017-12-29 14:23:05 -05:00
Bojan Nikolic
771bae04e8 gcc: Enable SSP and shared libs in the final stage for MinGW 
Hardening on by default now that we don't use the cross wrapper. In
turn, hardening requires libssp in particular.
 2017-12-29 13:27:02 -05:00
John Ericson
12e0672d88 gcc: Adjust builder.sh to find some things in bintools-wrapper instead 2017-12-13 16:08:19 -05:00
John Ericson
4e4520a0f3 gcc: Don't choke if there is no lib output 2017-12-10 17:36:15 -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 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
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
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
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 Ericson
74cbb5796e gcc: Get rid of crossAttrs.configureFlags 2017-12-04 20:50:59 -05: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
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
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
Orivej Desh
e188747d89 gcc-snapshot: mark as broken 
It is older than gcc7 and fails to compile due to ucontext_t changes in glibc 2.26.
 2017-11-16 20:22:10 +00:00
John Ericson
ab77a6bb1e gcc: Misc indentation and whitespace-in-string fixes 2017-11-14 18:32:50 -05:00
Ben Gamari
1c1207220f gcc: Refactor treatment of configure flags 
Previously configureFlags was defined as one giant interpolated string.
Here we refactor this definition to instead use the usual stdenv string
combinators. This seems more in-line with the average nixpkgs expression
and it seems a bit more natural to things of these as lists of flags
rather than monolithic strings.
 2017-11-14 16:23:46 -05:00
Piotr Bogdan
7112718a20 gcj: fix build with glibc 2.26 2017-11-09 20:50:21 +00:00
John Ericson
0101856765
Merge pull request #30549 from obsidiansystems/bintools 
treewide: Introduce stdenv.cc.bintools
 2017-11-08 14:20:48 -05:00
Vladimír Čunát
f04b64c1e9
gcc-4.5: fixup build with glibc-2.26 
The older the GCC, the easier the backporting :-)
 2017-11-07 15:39:24 +01:00
Vladimír Čunát
54c14e2fa3
gcc-4.8: fix with glibc-2.26 2017-11-07 14:53:10 +01:00