Jörg Thalheim
5e0f8f6762
Merge pull request #109919 from pjjw/musl-rust-bootstrap-fix
...
rust: add musl-libc targets to bootstrapping
2021-01-21 15:24:35 +00:00
Jonathan Ringer
9bb3fccb5b
treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
...
continuation of #109595
pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.
python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Peter Woodman
0b8620e9b6
rust: add musl-libc targets to bootstrapping
2021-01-19 02:27:41 -05:00
Frederik Rietdijk
379ca4ddcf
Merge staging-next into staging
2021-01-09 13:29:53 +01:00
Pavol Rusnak
271f4001c3
rust: fix comment about invocation of print-hashes.sh
2021-01-08 14:38:42 +01:00
Jörg Thalheim
4a580eb51b
Merge pull request #108635 from petabyteboy/feature/rust-1-49
...
rust: 1.48.0 -> 1.49.0
2021-01-08 05:31:47 +00:00
Luka Blaskovic
1f3cc427dc
rls: set RUST_SRC_PATH to rustLibSrc
2021-01-07 10:31:03 +00:00
Milan Pässler
dde8ad8d12
rust: 1.48.0 -> 1.49.0
2021-01-07 04:11:51 +01:00
Luka Blaskovic
c73d96f776
rustc: cleanup, use correct llvm version
2020-12-14 15:14:03 +00:00
github-actions[bot]
11d68e6adb
Merge staging-next into staging
2020-12-13 00:42:45 +00:00
Ben Wolsieffer
5a923e552c
rustc: add host platform to --target when building cross-compiler
...
As of 1.48, std is only built for platforms in --target. If the host platform is
not included, the resulting rustc can't compile build.rs scripts.
2020-12-12 15:24:55 -05:00
Jörg Thalheim
650db4a0db
Merge pull request #106284 from raboof/rustc-deterministic-manifest
2020-12-08 09:47:33 +00:00
Arnout Engelen
b909a333ad
rustc: generate deterministic manifest
...
The order of the entries in the manifest generated while installing
rustc depends on the (parallel) build, so let's sort it to make it
deterministic. Also remove install.log from the output.
Co-Authored-By: Jörg Thalheim <joerg@thalheim.io>
2020-12-07 23:02:09 +01:00
John Ericson
68fa053f46
Merge pull request #105383 from NixOS/more-rustc-musl
...
rustc: Improve musl support
2020-12-02 11:16:24 -05:00
John Ericson
47b99769f9
rustc: Improve musl support
...
There was a slight error in the target logic I didn't notice before, and
also should do the same thing for the other platforms.
2020-12-02 15:30:51 +00:00
Frederik Rietdijk
0d8491cb2b
Merge master into staging-next
2020-11-29 13:51:10 +01:00
John Ericson
5d75fe4ed0
Merge pull request #105314 from lopsided98/rustc-musl-target
...
rustc: allow building for musl targets
2020-11-29 00:39:36 -05:00
Ben Wolsieffer
2857455b03
rustc: allow building for musl targets
2020-11-28 22:15:35 -05:00
John Ericson
b7650aaa77
rust: Clean up target configs and test some more
...
See the new docs for details. The difference is vis-a-vis older versions
of this PR, not master.
2020-11-28 19:36:28 +00:00
John Ericson
8ddf5c6907
Merge remote-tracking branch 'upstream/master' into aj-rust-custom-target
2020-11-28 18:10:38 +00:00
John Ericson
c6617d28ef
Merge remote-tracking branch 'upstream/master' into aj-rust-custom-target
2020-11-28 17:09:12 +00:00
Milan Pässler
9eb79c42eb
rust: 1.47 -> 1.48
2020-11-24 09:26:47 +01:00
oxalica
68060f6f6f
makeRustPlatform: add rustLibSrc
...
rust-analyzer: rustcSrc -> rustLibSrc to fix build
2020-11-07 01:42:27 +08:00
Ryan Burns
33eb9cd961
rustc: enable on ppc64le
2020-11-04 20:56:54 -08:00
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge
...
I made a mistake merge. Reverting it in c778945806
undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.
I reconstructed the "desired" state of staging-next tree by:
- checking out the last commit of the problematic range: 4effe769e2
- `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
merge commit and its revert from that range (while keeping
reapplication from 4effe769e2
)
- merging the last unaffected staging-next commit (803ca85c20
)
- fortunately no other commits have been pushed to staging-next yet
- applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508 : libraw: 0.20.0 -> 0.20.2"
...
I'm sorry; I didn't notice it contained staging commits.
This reverts commit 17f5305b6c
, reversing
changes made to a8a018ddc0
.
2020-10-25 09:41:51 +01:00
Jan Tojnar
5c766c5c24
Merge branch 'staging-next' into staging
2020-10-18 21:21:03 +02:00
Aaron Janse
ccbc9988ce
remove unused import
2020-10-15 17:31:32 -07:00
Aaron Janse
d906fda8d2
parameterize rustcSrc
2020-10-15 17:27:51 -07:00
Aaron Janse
a153be896f
use rustcSrc
2020-10-14 22:54:04 -07:00
Frederik Rietdijk
b981eca057
Merge master into staging-next
2020-10-14 11:32:49 +02:00
John Ericson
c0df12de5d
rust: Add support for managing target JSON in Nix
2020-10-14 04:20:23 +00:00
John Ericson
f3db41d730
Merge pull request #99335 from obsidiansystems/make-rust-platform-separate
...
makeRustPlatform: Put back in it's own file.
2020-10-13 22:15:47 -04:00
John Ericson
54b4b470c3
makeRustPlatform: Put back in it's own file.
...
We expose it on the top level, but I don't think it makes sense to pull
it from a specific version of the rust tools when it is in fact version
agnostic.
This reverts a tiny portion of 912dca193a
.
2020-10-13 20:05:29 -04:00
Frederik Rietdijk
dc0aeee5db
Merge staging-next into staging
2020-10-13 19:35:37 +02:00
Frederik Rietdijk
9e1943edc0
Merge master into staging-next
2020-10-13 19:34:34 +02:00
Finn Behrens
75ead1b43a
rust: 1.46.0 -> 1.47.0
2020-10-12 22:29:20 +02:00
Ben Wolsieffer
f0fdecfbb4
buildRustCrate: fix target config environment variables on 32-bit ARM
2020-09-29 01:40:06 -04:00
Bas van Dijk
c01133316f
rust: remove 1.44.1 since firefox and thunderbird build with 1.46
2020-09-23 16:29:30 +02:00
Bas van Dijk
b837bd4305
rust: 1.45.2 -> 1.46.0
...
This adds the rust toolchain 1.46.0:
https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1460-2020-08-27
Because rustc-1.46.0 enables static PIE by default for
`x86_64-unknown-linux-musl` this release will suffer from:
https://github.com/NixOS/nixpkgs/issues/94228
So this commit doesn't remove the 1.45.2 release.
This commit also specifies the right LLVM packages to use for each
rust release.
2020-09-23 16:26:20 +02:00
Frederik Rietdijk
0ac85bc455
Merge master into staging-next
2020-08-17 14:54:39 +02:00
zowoq
473536e3b5
buildRustPackage: remove platform.all from packages
2020-08-16 12:48:18 +10:00
Alyssa Ross
5d65255d57
rust: 1.45.0 -> 1.45.2
2020-08-11 00:09:00 +00:00
Konrad Borowski
41d681c85f
rustc: use LLVM 10
...
Fixes rust-lang/rust#74585
2020-07-31 08:52:22 +02:00
Symphorien Gibol
2885306df0
rls: fix build
...
fix copied from rustfmt
2020-07-25 12:00:00 +00:00
Jan Tojnar
2988feba8c
Merge branch 'master' into staging-next
2020-07-23 08:19:14 +02:00
Aaron Janse
60fd049b65
redox: add as target
2020-07-21 13:11:36 -07:00
Cole Helbling
22fdfc7fbc
rustfmt: fix build with rustc 1.45.0
...
Due to a recent change in rustc 1.45.0, rustfmt now requires two
additional environment variables to be set in order to build
successfully: `CFG_RELEASE` and `CFG_RELEASE_CHANNEL`.
2020-07-21 10:32:59 -07:00
Alyssa Ross
e33bed77ce
rust: 1.44.1 -> 1.45.0
...
Thunderbird and Firefox don't build with 1.45.
2020-07-18 05:18:49 +00:00
Alyssa Ross
204d583573
rust_1_42: drop
...
Nothing seems to need this to build any more.
2020-07-02 17:42:39 +02:00