1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00
Commit graph

197 commits

Author SHA1 Message Date
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Symphorien Gibol d9d0647046 rls: tie version to rustc's 2019-08-21 11:21:01 +02:00
Bas van Dijk 06734a93e9 rustfmt: fix build on aarch64 2019-08-19 15:23:41 +02:00
Bas van Dijk b9c4bef090
Merge pull request #66713 from basvandijk/rustfmt-from-rust-src
rustfmt: use the src as defined by the git submodule in rust
2019-08-19 15:14:23 +02:00
Bas van Dijk 4e5d4d5509 rustfmt: enable tests 2019-08-19 15:09:15 +02:00
Bas van Dijk dc374218c9
rustfmt: make sure to test rustfmt instead of rustc
Co-Authored-By: symphorien <symphorien@users.noreply.github.com>
2019-08-19 12:54:40 +02:00
Eelco Dolstra 1f3c2bcefe
Merge pull request #66686 from edolstra/rustc-1.37.0
rustc: 1.36.0 -> 1.37.0
2019-08-17 16:22:42 +02:00
Frederik Rietdijk c68f58d95c Merge master into staging-next 2019-08-17 09:30:16 +02:00
Eelco Dolstra b7a8280312 rustc: Provide compiler-rt sources
This is needed to build libprofiler_builtins now.

e59f0cc0d3 (diff-daf9539767b10f18e1517f65cdc2e0e2)
https://github.com/rust-lang-nursery/compiler-builtins/issues/295
2019-08-16 15:08:12 +02:00
Eelco Dolstra a4fc84de44 rustc: 1.36.0 -> 1.37.0 2019-08-16 14:10:13 +02:00
Bas van Dijk 16cb2611d9 rustfmt: use the src as defined by the git submodule in rust
This commit makes sure rustc and rustfmt are compatible by setting
rustfmt's src to the rustfmt git submodule as defined in:

https://github.com/rust-lang/rust/tree/1.36.0/src/tools
2019-08-16 12:54:05 +02:00
Bas van Dijk 682e6fafa4 rustPackages.clippy: init at rust-1.36.0 2019-08-16 09:18:32 +02:00
Eelco Dolstra 7706f36d0d
rustc: Enable profiling support
This matches the upstream binary releases (see
https://github.com/rust-lang/rust/blob/beta/src/ci/docker/x86_64-gnu/Dockerfile).

Upstream also enables sanitizer support but that adds another 39 MiB
to the package size, and who needs sanitizers in Rust anyway ;-)
2019-07-31 22:47:28 +02:00
Eelco Dolstra 57adfbd3d4
rustc: Drop RUSTC_BOOTSTRAP
It's no longer needed.
2019-07-31 22:47:28 +02:00
arcnmx b53e237ef6
cargo: remove darwin hack
This seems to have recently resolved itself with updates
and is no longer necessary.
2019-07-29 06:50:20 +01:00
Eelco Dolstra 33723434a8 rustc: Add setup hook to set $CARGO_HOME
This works around 'failed to open:
/homeless-shelter/.cargo/.package-cache' with Rust 1.36 even when
we're using 'cargo --frozen'.
2019-07-07 15:18:09 +02:00
Eelco Dolstra 2c0a6e1ea0 rustc: 1.35.0 -> 1.36.0 2019-07-07 15:18:09 +02:00
Daiderd Jordan 368c415a01 rustc: don't patch precompiled binaries on darwin
This doesn't work anymore since 1.35.0 because the load commands end up
being too large, but this is a precompiled binary anyway so it's not
really needed or more impure to use the expected system versions.
2019-07-03 08:52:27 +02:00
Eelco Dolstra 513bd49b44 rustc: 1.34.2 -> 1.35.0 2019-07-03 08:52:27 +02:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Will Dietz 915c2de370
rustc: 1.34.0 -> 1.34.2, security
https://blog.rust-lang.org/2019/05/14/Rust-1.34.2.html
2019-05-19 03:56:31 -05:00
Matthew Bauer f0b7561275 rustc: use llvm5 for bootstrapping 2019-04-26 21:55:09 -04:00
Ivan Kozik a0c1b7be7d rustc: 1.33.0 -> 1.34.0 2019-04-12 16:32:19 +00:00
John Ericson 716503d063 Merge branch 'staging' into rust-cross 2019-04-01 00:47:46 -04:00
Michael Eden 8391528096 rust: disable stripping to prevent bad cross rlibs 2019-03-29 11:11:55 -04:00
Michael Eden 54e9082375 rust: Don't force gcc6 2019-03-29 11:11:53 -04:00
Jörg Thalheim 912dca193a rust: fix cross-compilation 2019-03-29 11:11:00 -04:00
Michael Eden 3c930188c8 cargo: No need to skip space around = at Nix level 2019-03-29 10:28:20 -04:00
Michael Eden 7f6de09751 rust: Fix grammar in comment 2019-03-29 10:28:20 -04:00
Luka Blaskovic 8d3e91077b rust: 1.32.0 -> 1.33.0 2019-03-01 07:56:40 +00:00
Jörg Thalheim 6f6900495d
Merge pull request #54323 from lblasc/rust132
rust: 1.31.0 -> 1.32.0
2019-01-28 16:14:57 +00:00
Jörg Thalheim b5c1deca8a
treewide: remove wkennington as maintainer
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
2019-01-26 10:05:32 +00:00
Ingolf Wagner c5f0dbb660 rustc: mark compileprocess as timeconsuming 2019-01-24 18:30:35 +01:00
Luka Blaskovic cc5b55f944 rust: 1.31.0 -> 1.32.0 2019-01-22 08:05:17 +00:00
Jörg Thalheim 84557733f7
rust: Remove unused buildRustPackage from binaryBuild.nix 2018-12-18 06:07:57 +01:00
Jörg Thalheim 3a5b4a631d
rustc: 1.30.1 -> 1.31.0 2018-12-06 22:22:10 +00:00
Jörg Thalheim 9e39329e1f
Merge pull request #50006 from alyssais/rust-1.30.1
rust: 1.30.0 -> 1.30.1
2018-11-14 11:29:22 +00:00
Alyssa Ross 934e489401
rust: 1.30.0 -> 1.30.1 2018-11-09 15:27:52 +00:00
Symphorien Gibol 973eca740b rustc: fix build with unbundled jemalloc and llvm on darwin
jemalloc with stripped prefix would cause segfaults in free:
https://github.com/NixOS/nixpkgs/pull/49557#issuecomment-436734677

Thanks to @danieldk for darwin testing/debugging.
2018-11-08 13:10:24 +01:00
Symphorien Gibol 4b0d441cc4 rustc: build with system llvm and jemalloc
Just like fedora does: https://src.fedoraproject.org/rpms/rust/blob/master/f/rust.spec

Also some cleanup of tests which were removed but no longer exist.
2018-11-08 13:04:37 +01:00
Daiderd Jordan 1b47b95638
cargo: fix darwin build
It depends the Security framework now.
2018-10-26 16:06:56 +01:00
Daiderd Jordan 0d64e81ce6
rustc: fix moved tests and darwin build 2018-10-26 12:14:24 +01:00
Jörg Thalheim cafecf16af
rust: 1.29.1 -> 1.30.0 2018-10-26 10:37:46 +01:00
Andreas Rammhold aef6830d3e rustc: 1.29.0 -> 1.29.1
From the changelog:

- The standard library's `str::repeat` function contained an out of bounds write
  caused by an integer overflow. This has been fixed by deterministically
  panicking when an overflow happens.
2018-10-03 16:26:48 +02:00
Symphorien Gibol ffafe959ee rustc: 1.27 -> 1.29 2018-09-14 14:22:56 +02:00
John Ericson 0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
John Ericson 2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
Tuomas Tynkkynen 7e0561370b rust: Set dontUpdateAutotoolsGnuConfigScripts everywhere
It's needed on ARM nowadays as well, so just put it everywhere.
2018-08-14 10:40:47 +03:00
Jörg Thalheim 218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
Frederik Rietdijk 8424ac61a9
Merge pull request #43862 from volth/unused3
[bot] treewide: remove unused 'args@' in lambdas
2018-07-21 11:14:44 +02:00