Commit Graph

364 Commits

Author SHA1 Message Date
github-actions[bot]
0b0b544416
Merge staging-next into staging 2022-01-30 00:02:26 +00:00
Jörg Thalheim
4c1d81c91e Revert "clippy: fix build (#152211)"
This reverts commit aaff0d644f.

Reason: proper fix is now in master, see https://github.com/NixOS/nixpkgs/pull/152197
2022-01-30 07:05:12 +10:00
Konrad Borowski
89f2ffcf56 rustc: 1.58.0 -> 1.58.1 2022-01-20 16:35:46 -08:00
Jonathan Ringer
560b3f416e rustc: 1.57.0 -> 1.58.0 2022-01-14 12:34:11 -08:00
github-actions[bot]
25662d01ae
Merge staging-next into staging 2022-01-04 00:02:40 +00:00
Jörg Thalheim
aaff0d644f
clippy: fix build (#152211) 2022-01-01 06:31:57 +00:00
misuzu
2a699029f4 rustc: build with jemalloc
This change should fix intermittent crashes on macOS Monterey.

Co-authored-by: Pavol Rusnak <pavol@rusnak.io>
2021-12-30 17:45:08 +02:00
Alyssa Ross
f56f3f7dcc rustc: 1.56.1 -> 1.57.0 2021-12-02 16:58:40 -08:00
John Ericson
f721e0f849
Merge pull request #145107 from Ericson2314/buildRustCrate-sysroot
build-support/rust: Fix sysroot for cross
2021-11-24 18:44:13 -05:00
John Ericson
2c7f62379f rustcSrc: Reduce duplication 2021-11-08 20:38:58 +00:00
John Ericson
4f81865aa1 Merge remote-tracking branch 'upstream/master' into staging-next 2021-11-07 20:51:04 +00:00
John Ericson
18ed048c7b build-support/rust: Organize
- `toRustTarget` and friends pulled out from rust tools into rust
   library. Since they don't depend on any packages they can be more
   widely useable.

 - `build-rust-package` gets its own directory

 - `fetch-cargo-tarball` gets its own directory
2021-11-07 14:16:49 -05:00
Alyssa Ross
703ffa2f5d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-11-03 07:34:33 +00:00
Martin Weinelt
c28e3f9d00
rustc: Expose llvmPackages set used to build rustc
Reusing the same llvmPackages version used for building rustc is
required for LTO in Firefox.
2021-11-02 17:34:05 +01:00
Martin Weinelt
3f9b49e0ec
rust_1_45: drop 2021-11-02 14:41:05 +01:00
Sandro
fb5f7b9841
Merge pull request #144204 from alyssais/rust-1.56.1 2021-11-02 10:53:03 +01:00
github-actions[bot]
3f03065e05
Merge staging-next into staging 2021-11-02 00:02:12 +00:00
Bernardo Meurer
949c9f67cd
makeRustPlatform: allow to easily override stdenv 2021-11-01 10:40:09 -07:00
Alyssa Ross
222e9b518f
rust: 1.56.0 -> 1.56.1
I've tested building fd on x86_64-linux.  Because this release is so
tiny[1], I'm confident skipping the usual, bigger, tests we do for
Rust.

[1]: https://github.com/rust-lang/rust/compare/1.56.0...1.56.1
2021-11-01 16:23:30 +00:00
github-actions[bot]
853a47c140
Merge staging-next into staging 2021-10-29 12:01:53 +00:00
Bernardo Meurer
00334d352f
Revert "makeRustPlatform: allow to easily override stdenv"
This reverts commit f17c3516fb.
2021-10-28 23:25:35 -07:00
Alyssa Ross
3f01b576af
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
	nixos/doc/manual/release-notes/rl-2111.section.md
2021-10-28 16:07:38 +00:00
Bernardo Meurer
f17c3516fb
makeRustPlatform: allow to easily override stdenv 2021-10-26 22:13:38 -07:00
Yureka
6594da569b
rustc: 1.55.0 -> 1.56.0 2021-10-22 10:04:09 +02:00
John Wiegley
96c0f7e4dd
rustPackages.rls: Fix 1.55 build on Darwin (#140232)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-10-03 02:16:19 +02:00
Alyssa Ross
28a97eab19
rust: 1.54.0 -> 1.55.0 2021-09-10 09:26:43 +00:00
Alyssa Ross
a43efb9884
cargo: don't use vendored curl
Using the curl from Nixpkgs will fix Cargo 0.55.0 on Darwin.
2021-09-10 09:26:42 +00:00
Jan Tojnar
7a04c2ad68 Merge branch 'staging-next' into staging
- boost 171 removed on staging-next
- re-generated node-packages.nix

; Conflicts:
;	pkgs/development/java-modules/m2install.nix
;	pkgs/development/node-packages/node-packages.nix
;	pkgs/top-level/all-packages.nix
2021-08-22 01:13:41 +02:00
Robin Stumm
d89c29deb8 rust.toRustTarget: fix for windows
change vendor from "w64" to "pc"
broken since 91718534f1
2021-08-20 12:43:02 +02:00
Alyssa Ross
1d1ef50501 rustc: 1.53.1 -> 1.54.0
Tested builds of fd and firefox on x86_64-linux.
2021-07-30 11:26:01 +00:00
Alyssa Ross
37ac6d6e76 rustc: 1.52.1 -> 1.53.0 2021-06-19 10:16:10 +09:00
Alyssa Ross
181f012824 rustc: don't install uninstall.sh 2021-06-18 13:58:16 +00:00
Sandro
c1a8f04935
Merge pull request #126725 from SuperSandro2000/cargo-no-ruby 2021-06-15 02:50:23 +02:00
Sandro Jäckel
f3ce27d2db
rust: remove ruby from rustPlatform 2021-06-13 20:38:22 +02:00
github-actions[bot]
65e3e9dc51
Merge master into staging-next 2021-06-01 07:50:21 +00:00
Zhaofeng Li
6288319a3a rust: Add support for riscv64 2021-05-31 14:55:35 -07:00
github-actions[bot]
f2a2e8f5e9
Merge master into staging-next 2021-05-28 12:48:40 +00:00
Daniël de Kok
1da0b1dbc9
Merge pull request #122158 from danieldk/import-cargo-lock
rustPlatform.buildRustPackage: support direct use of Cargo.lock
2021-05-28 12:07:25 +02:00
Daniël de Kok
b3969f3ad7 rustPlatform.buildRustPackage: support direct use of Cargo.lock
This change introduces the cargoLock argument to buildRustPackage,
which can be used in place of cargo{Sha256,Hash} or cargoVendorDir. It
uses the importCargoLock function to build the vendor
directory. Differences compared to cargo{Sha256,Hash}:

- Requires a Cargo.lock file.
- Does not require a Cargo hash.
- Retrieves all dependencies as fixed-output derivations.

This makes buildRustPackage much easier to use as part of a Rust
project, since it does not require updating cargo{Sha256,Hash} for
every change to the lock file.
2021-05-28 08:01:28 +02:00
Daniël de Kok
2f46d77e28 rustPlatform.importCargoLock: init
This function can be used to create an output path that is a cargo
vendor directory. In contrast to e.g. fetchCargoTarball all the
dependent crates are fetched using fixed-output derivations. The
hashes for the fixed-output derivations are gathered from the
Cargo.lock file.

Usage is very simple, e.g.:

importCargoLock {
  lockFile = ./Cargo.lock;
}

would use the lockfile from the current directory.

The implementation of this function is based on Eelco Dolstra's
import-cargo:

https://github.com/edolstra/import-cargo/blob/master/flake.nix

Compared to upstream:

- We use fetchgit in place of builtins.fetchGit.
- Sync to current cargo vendoring.
2021-05-28 08:01:25 +02:00
github-actions[bot]
a673990e6c
Merge master into staging-next 2021-05-25 18:43:22 +00:00
Daniël de Kok
7eddab91f5
Merge pull request #123867 from danieldk/maturin-0.10.5
maturin: 0.10.4 -> 0.10.6
2021-05-25 16:01:47 +02:00
Daniël de Kok
11307c1d47 maturinBuildHook: add rustc to deps
maturin 0.10.5 uses rustc -vV to find the host:

e886c85f5a

We now need to make rustc visible to the hook for maturin to work
properly.
2021-05-21 07:51:27 +02:00
Luka Blaskovic
ded99630e9 rustc: 1_52, use correct llvm version 2021-05-17 08:40:12 -07:00
github-actions[bot]
5c18268a6b
Merge staging-next into staging 2021-05-16 06:22:08 +00:00
github-actions[bot]
d6fe7f78a8
Merge master into staging-next 2021-05-16 06:22:05 +00:00
Ben Wolsieffer
9d6134ae6d rustc: allowing building for ARMv5
toRustTarget needed to handle the armv5tel case
2021-05-15 11:43:51 -04:00
Jonathan Ringer
4bb359aa99 rustc: 1.52.0 -> 1.52.1 2021-05-10 16:00:44 -07:00
Pavol Rusnak
252bf94a74 rust: 1.51.0 -> 1.52.0 2021-05-08 11:42:10 -07:00
John Ericson
50b6631929 rustc: Fix build
Thanks @jonringer for catching, and sorry I didn't myself!
2021-04-30 23:09:15 -07:00